I'm a Google Fi user but have not tried to sign up yet. Would you mind expanding on your point about Fi affecting the ability to upgrade?
Looks like they got some complaints from Fi users and now they've updated their wording to a more reasonable one; previously it was something like "no, you can't, you gotta remove your Google Fi Unlimited benefits via customer service" or similar.