Haven't gone through the entire thread, but just want to say I love the OP's passion. And I feel similar. I'm on an S7 Edge right now and while it's a fantastic device that has all the hardware features I miss from the old Nokia Lumia lineups, I do miss Windows.
I just can't bring myself to recommend Windows phones anymore though, or use one as my daily driver. Pains me to say it as I've been on board from the very beginning. But, I just had to cut ties eventually... how can I be so passionately committed when Microsoft's pitiful marketing effort shows it doesn't have the same commitment?
The app gap is one thing, though overblown. The bigger issue is app quality. Facebook Messenger for instance... I mean, some of the most basic features are completely missing.
I can only hope that 1) The UWA approach works, and 2) MS actually hires a competent marketing firm to push Surface Phones.