Don’t fight your speakers.

Agreed.  If the speakers have a fundamental flaw, it is cost ineffective (and a bit nuts) to work all your other components around that flaw.  Start with the speakers, then pick a complimentary amp, then pick the best source you can afford.

OP,

+1

You can see my current systems under my ID.

For me, it's don't fight the room.  You get off the upgrade merry-go-round a lot faster when that is right and speakers sound closer to the dealer demo when you get them home.

If you can, Room, speakers, equipment, cables or cables, equipment, source.

@curiousjim 

I agree a good room is a good start. It's gets a little complicated though because rooms can be treated and some speakers work better in some rooms than others. So a good room and a good speaker that's well suited to that room with appropriate acoustical treatments, which in some cases may be met with simple furnishings, and you're off to a great start.

Right now I'm temporarily using a very compromised system composed of a a pair of old Klipschorns mated to a bottom of the line Denon receiver. The system has its obvious sonic defects but those Klipshorns seem to get along well with that room and it makes it easy to enjoy the music. In a way it makes it more enjoyable because I expect so little from that Denon receiver and yet it really is fun to listen to for hours at a time with all sorts of music and sound tracks.