Welcome to upgradeitis. Two years ago I replaced my EM6910 with a VBM Domo Junior (HX). I was tossing up between the Giotto and the Junior but the compact dimensions of the Junior (22.5Wx35Dx40H), and the relatively small (in my opinion) amount of kitchen bench space I've pinched for my coffee gear, meant I came away from Talk Coffee with the Junior. Upgradeitis (for the espresso machine anyway) hasn't reared it's head since.. ..though assorted drip brewers, hand grinders and other coffee gear has managed to find it's way into the kitchen over that time. I reckon my little Junior is a perfect machine for me, I make a couple of morning Caps every day, usually an espresso of an evening through the week, a few more over weekends. I've tried playing the part of barista at a few parties at home and my woefully inadequate workflow means that the machine has never been the bottleneck. There's a generous drip tray and water reservoir so it easily caters for my normal weekend coffee routine. I've got it on an electronic timer so it's on and warmed when I'm up in the morning.
Everyone has their own unique requirements so see if you can find someone who'll let you have a play with whatever machines make your short list (the Junior's a fair jump over the $1000 mark, but given the section you're asking the question in, I guess there's a fair bit of scope price wise).
Looks like you've been on CS for a while, so you already know the sponsors on here bend over backwards to help you out before and after a sale. Good luck with finding your ideal machine!