only 2? give it at least 3 M this is your last system.
http://www.home-bari...nce-t20814.html
looks interesting. get your grinder at the same place you get the machine. I also went doserless as i thought less to clean. and clean is very important. i got the Compac K3. Im very happy with it. its a tiny chore to clean but no big deal. what I have perfectly suits me. it might not suit others.
the question you have to ask yourself is " for me the perfect espresso is ... " leave yourself a little room to get a system that costs a little more than you thought you would spend.
Win the lottery did you?
http://www.home-bari...ective-gs3.html
http://www.seattleco...spresso-grinder
or
http://www.seattleco...0-vario-grinder
dont think for a minute that 10 K will make a better cup than the stuff I have or you are considering. there is the 'hand of the barrista' which is the limiting step.
Roast your own? ..... 
Im sure ChrisCoffee ande Seatle Coffee gear will have a matching grinder for you.. dont get more grinder than machine. if you buy both at the same place you will save a great deal of Moooola. and might even get free shipping.
take your time. the two places are not the only ones that sell great stuff. if you decided after talking to both places many times on the machine and the grinder, shop around. you might find them else were but dont change your mind after youve made up your mind unless you have good reason to