I use the Markets Client. Can I just:
1. Save my keys
2. Do a complete uninstall
3. Download the latest version and do a virgin install?
I don't mind syncing from scratch.
That should do it, right?
Technically, you should be able to do that and get on the correct chain; however, it's recommended to use the bootstrap, as that will give your wallet another level of correct block verification.
If you do complete uninstall, just double check to make sure that 1. your keys are backed up, and 2. that the bitbaydata folder has been fully removed.