Sounds like the same dilemma I had about two years ago. I ended up buying a second hand Rancilio Sylvia from one of the good CSer here. It is a really great machine ;D
I guess it also depends on your budget.
On the other hand grinder wise, I also started with an EM0480 and have recently upgraded to a Mazzer Mini. I found the EM0480 was a really good starting point even though it has its quirks.