New Set Up

Speakers agains a wall require speakers that are no dipoles.
You post has a lot of aspects.I would separate them.

The challenging room and speakers are probably the most important.
As budget usually comes in at some point, what is it?

I have no experience with either of those speakers and see no measured data for them, so I can offer no suggestions other than my opinion that the speakers are THE most important part of the system.
Many claim that the room itself is the most important.

On the electronics and source side, things like MiniDSP, the TDAI 1140, etc. I also have no experience with. However they seem like they could be useful for helping the room… at least in theory. And hence I am mentioning them.
Some of those smaller speakers have a lack of bass, so the addition of a small powered sub might have a role… provided that they actually have some output below where the speakers peters out?

I have 35 year old speakers, and while I have a new second hand amplifier, my preamp is also last millennium (‘98).
All I know for sure is that it took me ages listening to speakers, and I also had a guiding hand helping (slapping) me out. That also applied to the preamp and amp from that era.
Literally it took months of looking and listening.

The fact that they still seems to work is somewhat of a testament to things, but the specific speakers are well known to not work in a corner. 
I would recommend you make a list of dipole, bipole and monopole, and listen to examples in each group. Dipoles are known to work in small room, but not in the actual corner. If you find examples of each that you like, then it gets down to whether you can try them in your room. (Most bookshelf ones are monopole, maybe with a rear port… I like how the dipoles work myself)
Starting that way you at least could separate out di/bi/mono, which maybe help to sort through the chaff?
That Naim seems a lot like the TDAI 1120 or TDAI 3400. Just that the later two also have a room correction built in. Either you are a purist that wants none of that, or you can appreciate it.
I have both, so I guess I may become a fence sitter? The HT one is actually in transit, and it has the room correction, and then I can either push out of it, or out of the 2.1 in purist mode.Hence my only suggestion is that I suggest that you listen… Not that room correction is required or recommended… just that most higher end systems do have some correction and leveling in the <200 Hz region.
There are a couple of Lyngdorf dealers in Beijing, so I would be interested in you perceptions of the TDAI versus the Naim unit?At least it can be fun looking… better bring some CDs you know and like.

Spotted the reference to ATC SCM 20.  I would simply add active to that already great ATC speaker.

I know nothing about the ATCs either, but if they are like a Dutch-n-Dutch, then it opens up opportunity when they just get an input signal.

@beijinglarry any progress this week?

JFC the cables are not as important as the speakers.

What speaker cables do you use?

Literally lampshade wire at the moment.

But usually I use Mogami, however I am going to try some Kimber 12TC as they are the lowest inductance that I know of.

When the new cable comes in I will remove the lampshade (temporary) cables that I needed to use when going from dual mono blocks to a stereo amp.

But they are high quality lamp cords with cryogenically aligned copper, and fairy dust.

@jerryg123 I updated my avatar to the current setup.  

@jerryg123 just 1st order cross overs… and passive.

Regarding the Neats, I have no idea. But there are also speakers like the Dutch-n-Dutch which are powered. And if a powered speaker was chosen then they do not even require a speaker cable.

Whether an amplifier with room correction is used or not also adds some decisions… and these days there is a lot of options that can be used to fix up a room digitally. But the purist approach is often preferred. 

There are so many options, that it should be expected to be a complex process to come up with what is optimal. Which can make it a bit of fun… or daunting.

Again, starting with the speakers are working backwards is a sensible way to approach it. Or if one wants the room correction, then know what a particular amplifier can drive, can also influence the speaker choice… so it can be complex.

The OP has been quiet, we need to Peng them for an update.

OMG what a horror show! OP you are taking advice on a $27k system from a guy literally using lamp cord, who buys based on inductance because he thinks it all sounds the same anyway. Sorry. This happens. Nothing we can do about it. Free forum, anyone no matter how .... nevermind.     
 

If he gets the Kii-3 then he only needs the lamp cord for running power to speakers ;)
(No external amps, no speaker cables.)

That would not be a bad choice for speakers, and their review just came out a few days ago.

Dutch-n-Dutch also come to mind.