So apparently the espresso machine that I ordered (listed as in stock so I guess not so much) isn't being built anymore so the place I bought it from is working with me to figure out Plan B. Plan B might be an Aurelia Wave. The major down side is that it's a physically larger machine. They're trying to figure out how to make it fit my budget.
Plus side, the price includes installation (ships to an installer) so that at least won't be an extra charge.