Revel F35 vs Klipsch Heresy II or maybe III

First time post so please be kind.

I’m considering a brand new pair of Revel F35s for $1,000 (retail $1600). I’ve heard them and I think they will work better in my 18X22  Vaulted main listening room...(likely with a sub)...than my current Def Tech BP8040s (ebay $800) that are just to airy in that room. No punch at all. Nice at low levels but nothing even near loud. I have a very average Yamaha RXV1000 receiver now that I will upgrade to amps / inters of Mac or Parasound or possibly Emotiva. Stereo only..no mulit channel.  Have only heard the Mac so not sure. I stream Spotify thru a Bluesound Node 2 about 98% of the time right now. Listen to everything from Steely Dan to David Gilmore to Miles Davis to Postmalone. I want Klipsch Forte IIIs but can only afford the F35s or maybe Klipsch Heresy IIs or IIIs. I love vintage Klipsch sound...but also the direct sound of Energy, Boston Acoustics and now Revel.

Any thoughts on what my best next step might be?

Thanks....