I have no brand recommendations. However, don't use your Yamaha as a pre-only, at least not for very long. Integrated units are made to match the pre- and the power- stages...the pre-outs are just for convenience, or subwoofers, or whatever.
If you want a step up get a better integrated or go fully separates...