Have you taken a look at what's locally available? The Greenbeanery has a Kedge T1, which is supposed to be an Astoria clone. It has a 6l stainless steel boiler(!), volumetric dosing, and Im' pretty sure it's a rotary pump - for $1,650 (CDN!!!).
It seems like a very high quality machine with great parts for the price - Paul Pratt reviewed the machine and thought it was well put-together.
http://www.greenbeanery.ca/bean/catalog/product_info.php?cPath=35_144&products_id=1519To me this seems like an incredible deal, and I would look at it very carefully before spending more. It even has a 1-year warranty, which is serviced locally for those of us in Toronto.
If i was looking for a new machine right now, and I might be soon, this would be first on my list to check out.
Mark