I'm on Fi right now. Don't know what your time frame is, but I'm sure it's worth waiting until the new HTC phone comes out (forget what they're calling it--not Nexus). The Nexus 5X is ok, but it's kinda cheap. Having never seen the HTC phone, I can still almost guarantee it will be nicer. Also, you get $150 discount on the handset when you sign up for Fi. You may already know that, but it's not heavily advertised if you just go on the Nexus page. I almost bought the phone then signed up for Fi, because I didn't know any better.
Yeah, been looking at that. Good tip about the 5X 'cuz I was going to saddle my wife with one. Apparently the specs between the Nexus 6P and the "Google Pixel XL" are pretty damn similar so I was thinking of jumping on it... but if the 5X is plastick-ey we'll hold off. Assuming my wife's iPhone survives another month. A friend tried to order the new iPhone in blacker-than-black. It wouldn't let him. "mostly black" was due end of November. Ridiculous.