Your decision revolves around whether or not you want to go down the room correction path. If so, I would get a decent $2K new SSP with HDMI. This technology progresses fast and the older SSP just don't have the features you need.
The alternative approach is the focus on the 2 channel signal path. The 95 has excellent DACs, so no issue there. A good 2 channel preamp with HT bypass will definitely improve performance. Next you could get a good stereo amp or monoblocks.
Before deciding which way to go I would get a copy of the free REW (Room EQ Wizard), and measure your room. If it appears you have significant room mode issues the room correction path is probably preferable. If not, I would go the 2 channel sans EQ optimization route.
Keep in mind that if you are a savvy audiogon shopper, you can get a used preamp at a good price. If you don't think it does enough for your 2 channel system you just sell it and lose may be $50 worht of shipping and transaction cost. You can do the same with 2 channel poweramp.
If a new SSP does not work out the way you are expecting you end up taking a bit more of a hit.