"Classic rock, hard rock, 80s new wave, punk, pop (classic and modern)". I like these genres too. The frustrating thing is often these recordings sound better on car stereos and headphones than they do on high end systems. For example, about 15 years ago I heard Atmosphere by Joy Division in my mom's car. It sounded great, lively with great frequency extension. Not on my stereo systems, nope, sounds lifeless and dull. If you turn up the volume to liven it up and hear some of the inner details that I heard in the car, it just hurts my ears.
So to find a system or speakers that work well with that music/recordings. It is a challenge for sure. Speakers aside, maybe try a tube DAC or a source that is going to send a warm signal through the system. I have the Klipsch Cornwall IVs, they say it is a great rock speaker. I don’t know, I have had my challenges with it. Getting a Tube DAC (Black Ice Audio) and damping the mid horn and tweeter sure has helped. For example, playing The Stone Roses now, sounds pretty darn good, before it sounded dull, lifeless and harsh, almost unlistenable. It doesn’t sound like Roxy Music’s Avalon or Dark Side of the Moon, but it was a lot more enjoyable than before. I would only recommend the Cornwall IV if you are willing do the work. Two other speakers that are easy on the ears and good with the music the OP likes are the Wharfedale Lintons and the Polk Audio R700s. Neither are nowhere near the 10 grand mark. I haven’t heard them but I have heard great things about the Rosso Fiorentina Certaldo 2, from their description they sound like what you may be looking for.