System Upgrade Recommendations

Hello Everyone,

I'm looking for feedback for upgrading my system.  I'm just getting into HiFi and wanted to get some feedback from audio enthusiasts.  I think I'm basically done with my Home Theater setup, but would like to improve my 2 Channel listening experience.  I listen to music about 50% of the time, watch 2-Channel TV 30% of the time, and watch 5.1 movies, TV about 20% of the time.

I have the following set-up and about $2k to update the system and will have another $2k in 6 months:

• Magnepan 1.7i Speakers
• Marantz SR6010 Receiver
• Rel T-7 Sub
• MartinLogan Motion 4 Surrounds

Per the Maggie Dealer, I need to properly amp my maggies and the SR6010 doesn't fully cut it and I agree.  His setup sounds better on 1.7i's than mine does (He is using a $20k+ setup from source to speaker).

I'm debating on putting all $2k into a stereo amp, then $2k into a pre-amp with HT Bypass and music source in 6 months or splitting the $2k into an integrated amp with HT Bypass and a music source now.

I currently play my music via Spotify Connect through my receiver and don't have a music collection at all.  If I move away from Spotify (which I want to) I need to re-allocate some of my equipment funds towards purchasing a music collection (CD, Vinyl, or Digital) or reallocate $250/year of my equipment funds to a Tidal Premium subscription.  I plan on putting a Vinyl collection in the future (1+ years from now) but I don't feel that my current setup will benefit from Vinyl.

How would you spend $2k to improve my 2-Channel listening experience?  Any recommendations on specific equipment that I should listen to?