After much deliberation I ordered a Tern P7i from Thor. It was just delivered but I won't get to unpack & set it up until the weekend. I'll post some first-week observations after my first week of riding and transiting. It's not inexpensive, but the upgraded components, adjustable handlebar, and especially 85psi Marathon tires made the decision for me vs. the D7i.