If you're going to go for a universal counter, watch out for the HP 5315/5316 units. They're pretty good, don't take a lot of space and are very quiet and reliable.
I was eyeing a nice unit, but I let it go because it didn't have any connectivity options. GBIP is available on one of the units you mention, but a bit of a hassle to actually run and doesn't come quite cheap either. As I've said elsewhere, to me it's a "nice to have" and not worth spending stupid money on. The nice models all seem ridiculously expensive. Thanks for the suggestion though, I don't think I've looked at those two models before.
I'm still on the fence about a Rigol DM30X8 multimeter. It should do everything I need, though somehow it doesn't quite feel like the quality mainstay meter I'm after. Then again, they're good enough for Shahriar, so maybe I shouldn't be so pretentious.