I am doing the same thing and have a quick follow up...
Seems like I first MUST connect to google in order to download Smart Switch on my new replacement S6, but when I do that it will start syncing google contacts, etc.
Assume that is all ok and I still do the stuff mentioned above ?