bcupari... just stumbled upon this thread.
FYI, we have a couple DIY techie members in our local Suncoast Audiophile Society, who may be able to recap your C-J gear, if you haven't otherwise found a solution.
Also, you might want to attend the upcoming Florida Audio Expo (Feb 21-23) and ask local audiophiles for advice re value of upgrading.