I too plan in staying with this ecosystem. It's still young and going through "teething pains", but I expect it to get better.
The one thing that I won't do, is buy another carrier branded, locked device. Only devices that are available worldwide, and updates come directly from MS and/or the manufacturer.
I always purchase my devices outright, so it isn't an issue for me (just save a little over time, till I have enough).