You may consider it a downgrade but, I can't help but mention the Thrustmaster t16000m FCS. The stick is highly regarded, but you have one already. I bought the stand alone Throttle, the TWCS, from Thrustmaster and mated it up with my existing stick, and I am liking it. For $80.00, when added with the T-16000M you already have, you could have at least a great backup HOTAS for when your Saitek stuff bites it. The TWCS has tons of buttons. I have a number I haven't even mapped yet.
While the stick is good, it is a downgrade in eveything but reliability. The analogue on the FCS is terribly placed (throttle) and the base stick buttons are awkward. Still a good bit of kit though and decently accurate