Found a reasonably priced OnePlus One, so it's time to truly battle test Ubuntu Touch, since I'm just a weird round peg in a square hole.
Still not giving up on iOS, but I'm keeping my eyes open and looking at the alternatives outside of the big two who dominate the market. Since I think there is more movement behind Ubuntu Touch than any other interesting alternative, that's where I'm going first.