I went back to the iPhone and have been pretty pleased with it so far. I had the S3 and S4 and those things just could not handle any amount of abuse and the glass cracked when the temps got below 0. The iPad Pro is probably going to be a hit and that's really, really sad. The Surface is a dick rider too but it's at least a solid, reliable dick rider.
That said, I just got an MacBook Air and really like it. I'd much prefer a more power laptop that I could just run Ubuntu on but for a locked down "thin client" it ain't that bad.