Spend more money on the amp or the pre-amp?

Yes, thanks for the update. Too often we never hear back. You did well.

Wow, those are great prices! How's it all sounding?

Sounds like you did well. However, I still want to make a suggestion with respect to the orginal question: how about the new Yamaha RN803d receiver? It is 2x100 watt rms at 8 Ohm, has digital inputs, Spotify Connect Airplay, networking capability and much more. And it has room equalization capability.