The X3400H is a good option, but assuming you are getting by well enough with your Yamaha, I'd suggest you wait for the release of the X3500H and pick up a 3400's when they are being closed out.
@AcuDefTechGuy probably has as good of a read as anyone on when this is liable to happen and what type of discount you might hope for. Hopefully he will comment on this.
Although, I have had nothing but good experiences with my A4L refurbs, I suspect you will be able to pick up a 3400 new with the full (don't remember if it is 2 or 3 years) warranty for the same price or less if you wait!
IIRC, the 4300 went for $700 last year. I don't remember what the 3300 went for.