More money on speakers is what I'd do. Instead of that RX-A3080 why not the A2080? Or even better, the RX-V2085, which is identical to the 2080 but with one less year of warranty, and 'only 4 rubber feet' instead of 5 for the Aventage line! Big deal, eh? For a lot less. Over the years I've compared the 30x0 to the 20x0 line, the 20x0 is nearly the equal of the 30x0, with a few less wpc, if you believe Yamaha actually does install different amps in these two lines. If you already had external amps I'd say the RX-A1080 might be something to consider.
For the record, I've owned the Yamaha CX-A5000, and a few other Yamaha AVRs as well, including my current AVR, the RX-A2070. They just work, and are as tough as they come. I haven't missed the CX-A5000 at all. Great preamp/processor, but it did nothing that the 2070 can't do, and the 2070 has Atmos. For myself, having way less cabling, and more space in the audio rack is well worth it. Sound quality is very similar. For two channel music, I do have an integrated amp, yep, a Yamaha.
For the record, I've owned the Yamaha CX-A5000, and a few other Yamaha AVRs as well, including my current AVR, the RX-A2070. They just work, and are as tough as they come. I haven't missed the CX-A5000 at all. Great preamp/processor, but it did nothing that the 2070 can't do, and the 2070 has Atmos. For myself, having way less cabling, and more space in the audio rack is well worth it. Sound quality is very similar. For two channel music, I do have an integrated amp, yep, a Yamaha.