Upgrade path

ascertain what you have now and for the rest of your life

you can use test tones and an inexpensive SPL mic and make a chart and measure what you are getting, the results of any alternate positioning and/or toe-in, and future changes.

this CD has 29 1/3 octave test tones

https://www.discogs.com/release/7290000-Various-Amazing-Bytes?srsltid=AfmBOooCbmdDtJiwxtnjyZg7fpWqsu2yEAcDB8vBhwNwSKljSIYIVUdv

I could help you find an inexpensive copy

and, you do not need professionally calibrated mic, just measure spl, each realative to the other, it needs a hole for tripod mount, set at seated ear height in your listening position

https://www.amazon.com/Decibel-Mengshen-Measurement-30-130dB-Included/dp/B01CZFCRA8/ref=sr_1_12_sspa?crid=BUDL9QCNIYLI&dib=eyJ2IjoiMSJ9.phgj0S1FMI2tb2XMRTwtyFsUra_pKZ-DrgHet-4fZw2gjP2Acng2wdDlE8DeP3mfBr8PHolP0iJop9dajbKtD_02b5Ey43fdj1WkpqfYolh0yCoZfR_Wvm2OhBNPIXQ2aTvwKUdVJ_BBk5sIfOjxejflfefHnF9QksvxAPuU1hahaH5WA_1VIGH0sb04tHt0cG6llR2mAq6-7suYa8JIlu0rML5z7tCl67TMEPluS0g.5YoclwGlGqxeTj79cFiDOVIbTLwJBdhDufbzoymA21c&dib_tag=se&keywords=spl+meter+tripod+mount&qid=1760721367&sprefix=spl+meter+tripod+mount%2Caps%2C84&sr=8-12-spons&sp_csd=d2lkZ2V0TmFtZT1zcF9tdGY&psc=1

I cannot really answer your question directly, but, note: The best advice I heard when building a Stereo system is "Start with the equipment closest to the ear and work backwards".   So, this means to pick the speakers first (including if you are going with subs, or towers, or both), then pick the amp(s), then the pre-amp, then the sources - digital or analog.  Of course most people pick the amp(s) and pre-amp together.  The same thing regarding cables...  Start with speaker cables, then pre-amp cables, etc....  Of course it is best if you could buy everything at once and hear it all together, but, most of us cannot, so, this is a good rule to follow.  One good logic for following this plan is that all the components will match the speakers you bought because it is the first thing you picked, and the sound should get progressively better as you upgrade since you liked the sound of your speakers from the beginning.  Another point is that amp to speaker matching is critical as you dial up the volume.  So, check current requirements at specific ohms for the speakers and make sure your amp(s) are up the the task.  Of course, this also means that you should spend the most time picking your speakers and how they will sound in the room they will be installed.  Speakers have the most effect regarding the sound of the stereo system. 

You got some nice gear. Would not invest in anything new, until you have your current setup sorted out. What does that mean?

1. Speaker placement

2. Speaker placement

3. Speaker placement.

4. Sorting out placement of all the other gear

5. Power, how and where it all plugs in, sorting power from signal cords

6. power conditioner? 

7. Rabbit hole of what cable works best

8. Should I get a deadicated line?

9. Back to speaker placement...

10. room treatments

What I'm saying if your gear is setup wrong or in the wrong place, it doesn't matter how good it is, you will not be hearing it. Speaker placement is #1, other things will fall into place. But as things change, you will revisit, the list over and over. 

It's a lonely hobby and not everyone will get it. 

@OP. You are a long way from getting to a point of small incremental improvements. 

However, as this is your first real hi fi system, you should spend time listening to it.

At the same time, the best investment you can make is to go listen to as much unamplified live music as you can - when I say unamplified, I mean non classical/folk/jazz some of which may have small amounts of sound reinforcement, but not big PAs.

Then setup and acoustic treatment of the room before you change any of the equipment.

Then if you are changing any of the equipment, including cables, make one change at a time and listen for at least a couple of weeks to be sure that what you are hearing is an improvement and not just a change. 

Try to find a dealer with knowledge and integrity - it will save you money in the long run. BTW, while Naim equipment is not my particular cup of tea, as they would say in Wiltshire - I think what you ended up with is a pretty well balanced system.

Is this just a dedicated space or a full room ? If it’s just a space build a room if possible