Hey theres a EM6900 for sale in the For Sale section for 250 I believe.
Its located in Sydney, however. Could save some cash and then look at grabbing a BCG800 (Brev Smart Grinder) for around 170 from memory if youre lucky. Some of the snobbier members will know the go with them* :P
EDIT: Or keep your Em3600 (I have one and it goes ok) and get a really nice grinder for the cash. Grinder is going to help you more as opposed to the machine. Go this route and buy some unpressurised baskets and then tada, great coffee.