Yamaha 3020 is probably the smoothest transition for you. Or a 3010 if you want to save a few bucks. Or I would recommend getting an onkyo 3009/5009 now while you can or 3010/5010 if you don't mind paying the high msrp as of now and getting active cooling since they both run hot but sound very nice. Denon 4311 or a 4520 if you can be patient would be another great option and rumor is msrp out of the gate is $2500 and that seems to be within budget. Pioneer and Yamaha will have limitations on room correction but supposedly do what they do very well.
butter and jelly please.
Home theater gladly not designed by ereed or bgtighe23. 65" JS9500, Marantz 7702MKII, Parasound Halo A31, ClassDaudio SDS470 4ch, RBH R56, 4xRBH R55, 2x RBH R5, Hsu VTF 2 MK 3 and VTF 3 for subwoofage, OnStage MS7701B mic stand with boom for improved Audussey XT32 calibrations. Listening space happily treated with 1" OC 703 rigid fiberglass. OPPO 203 or 205 soon.