Possible upgrade from Totem Forests?

System: Totem Forest speakers (not signatures), Simaudio 390 Pre/DAC/Streamer, Simaudio 330A amp (125 watts 8 ohm, 250 4 ohm), Acoustic Zen cabling (Satori speaker, Matrix II interconnects, Tsunami Plus cord). 

Music: Alternative, EDM, Rock.  Streaming with Apple Music via Airplay.  TV is also connected via HMDI eArc for TV/Video viewing. 

Room: This is the tough one due to furniture/room aesthetics and can’t be changed.  NYC Apt in living/dining room 15x30, sit about 7 feet away. From wall, there is about 22 inches before speakers would overly protrude so the speakers will likely be 12 inches or less from the wall depending on speaker depth.

What improvements:  With the Forests, dynamics and detail are strong and bass is deep and fast.  Ideally, would like to enhance further these elements.  Imaging is fine but probably suffers from positioning which can’t be substantially altered.  Play at modest volume levels ~50-80ish db.

Speaker Upgrade:  This is a challenge as the forests work well from a footprint standpoint and are very good performers.  Have upgraded electronics and cabling over last six months and now considering speakers. Looking for suggestions, budget around $5-7k new or used but a) must be be a fit space wise and b) a noticeable step up from Forests.   Could be smallish floorstander or standmount.

Some potentials that look interesting new PS Audio 5s or 10s, Borrensen X1 but wide open to anything.  Seems like lots of Sonus Faber fans but question if good for the type of music I listen to.   

Appreciate the guidance!