Decided on the 7d with a derailleur. Talked to a bike mechanic buddy and we agreed that having the parts out where I could keep them clean and lubed was a better choice.

I'll wait til we're down at the condo over xmas and buy from the new LBS.