What I want to do its use both my phone and my fob but this is not an option at the moment and since its really niche I don't expect it.
And If you are planning to update a phone defiantly wait. I had issues with my secret questions during pre-launch and spent 2 hours on hold, after waiting until 5 am just to get my call through. when they actually answered it was to tell me that the system was down on their end and I was sol.