Update.. I have encountered other problems with my approach and decided to simplify things by forcing the entire site to use SSL. So the above is no longer an issue for me.
Yes you need to force the entire site to SSL. So that all the http:// links into your site will not be a problem and your site loads with https:// without any issue.