Orbweaver Replacements/Alternatives/Advice etc.

Good evening! Just after some advice, opinions, thoughts or even inside knowledge ;)

I've used gamepads back since the Belkin N52 first came out, and to this day I can't imagine going back to a keyboard. I've been through the iterations, with the most recent being the Orbweaver Stealth. unfortunatly however, this one is starting to get a bit long in the tooth. The palm grip has come off, the top thumb switch has stopped working, and the Synapse 2 software is no longer current and is also causing sleep issues with my PC.
I'm considering attempting to replace the switch as i do know how to solder, however I can't help but feel it's only a matter of time before other things start to go.

I have long considered picking up the Tartarus Pro, however at this stage even this now seems like an old device and I'm concerned that with my luck, I'll buy it and then Razer will anounce an updated version.
However, I am also just as concerned as to how big the actual market is for this product and I wouldn't be suprised if the line is cancelled completely leaving us without any real replacement.
On top of this, those "upgrading" from the Orbweaver seem to have mixed opinions on whether it is a better product.

Is anyone currently or has been in a similar situation and what have/would you consider doing? Are there any rumblings of a new version, or any thoughts on whether Razer are even considering it? Any Razer staff that wish to spill any beans? :)

Thanks in advance for any advice!