Expect a lot of replies telling you "don't let the door hit you on the way out." None of my friends have had bad experiences with their 920s, but overall it does seem that WP8 is nowhere near as mature as WP7 is in terms of stability and bugs. Having my phone lock up using bluetooth would drive me crazy too, and replacing 5 devices is ridiculous.
If the S4 or HTC one happen to fit your use cases and needs better, give it a whirl and see if you find android acceptable now compared to when you initially used it. Both are great phones, despite how evangelists will try to spin things.
Worst case you decide you want a windows phone again, you can get a 920 off craigslist or ebay for $300 or less in my area. If the amber update fixes your issues and you want to jump back in, it's not going to break the bank. Seeing as we don't even know when this is coming out or when at&t will deliver it, it's up to you if you want to wait it out or not.