Thanks Dallant! Yeah, it's a tough choice for sure... but in addition to the controller, I also like the gunmetal Grey color better than the navy, and the lights, metal fenders, and upgraded drivetrain etc. are also pretty attractive.
I hear what you say about the crappy "rack" on the 8. I use Ortlieb panniers on my current commuter (1999 Trek 6000), and it actually seems like they'll fit well on the 8's rack. One concern I have though, it I think I read that the 8's rack has only a 15 kg capacity, or 33 lbs which seems like nothing! Granted I don't commute with very much heavy gear, but what happens if I want to load up on groceries or bottles of wine one day?
There's also a $600 difference between the 7 and 8 here in Canada (and they don't offer the "S" versions here, unfortunately)... So we'll see. I haven't actually seen an 8 in person yet, but I found a couple of local dealers that have my size in stock. Planning to check it our this weekend!