I like the way you combined and simplified this. Seems so logical really. A few months ago I added the line below and now if I try to access my site without https I don't get any 301 redirects as long as I have www. in the request. I just noticed that recently in doing some test.
Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"