Upgrading from CMStorm QFR: Recommendations?

[nowsharing]

Long time no see, Geekhack. Hope everyone is still rocking.
I got a set of Pulse SA caps and feel like I should get something nicer than my CMStorm QFR for them. I love its layout, but the rest is just OK.

What would you recommend as a high-quality (metal frame/parts ideally) upgrade, sticking with the same layout? I love my Pok3r's feel, quality wise, and would love an 87-key of that caliber.

I am a lover of tactile/clicky switches like Cherry Blues, and have 50+ BS keyboards, etc, but my daily driver is usually the QFR because it fits my setup so nicely. I'm open to better clicky/tactile switch recommendations as well.

[suicidal_orange]

Things have changed a lot in the past few years - the Pok3er's random mounting points are now frowned on for allowing uneven flex and there are new clickbar switches which are way better (according to clicky fans) than Cherry blue and clones - you'll have to read or watch some videos to see what you like.  There's a review with comparison to lots of others here for starters.

What hasn't changed much is the availability of DIY TKL kits, which remains low.  You can probably buy one from China but last I heard shipping was still slow so not great timing.  If you're in no rush and don't mind potentially getting nothing you might want to join a group buy?