Preamp choice, after all these years

Hello. I am in the market for a new to me preamp. I am leaning towards used Mcintosh. I plan to hook up a CD/SACD player, the Sony DVP-9000ES to the preamp using TOSLINK or digital coaxial cable. And a DVD changer Yamaha DVD-C920P, also using TOSLINK or digital coaxial cable. For video I can connect the Blue Ray DVD player to the TV through HDMI interface, and then connect the TV to the preamp through TOSLINK cable to get the digital audio. My budget is $2000 and could be as high as $3500, if I could persuade the wife. Ha! Ha! I have a MC2200 now which I plan to take it to a stereo repair shop to get her serviced and recap depending on the cost. I only paid like less than a $1000 for her more than 5 years ago and I have some wiggle room for this budget. I know it is probably time to switch over to all HDMI interface but I could not see the cost being justified at this time. I could use what I described above and get the same result for digital audio but correct me if I am wrong. What is your advice on the choice of the preamp and what do you like about it? My hearing is really good and I want to treat myself after all these years using my Onkyo TX-NR801 which I was quite happy with as a A/V processor. I wish there are sticky threads that recommends High End Amplifier, Mid Range Amplifier, and Budget Amplifier. And there is a similar sticky thread regarding High End Preamp, Mid Range Preamp and Budget Preamp. The board members could just refer to these threads that is full of review or recommendations for the two categories. Of course the range of the budget is relative. To me high end means above $5000 for a single component, mid range is from $2000 to $5000, and budget would be below $2000. Below is a list containing my system:

Name         Model           Year Original MSRP
Mcintosh   MC-2200        1976   $2,295.00   preown
Yamaha    DVD-C920P    2001   $399.00      preown
Sony        9000ES           2001    $1,500.00   preown
Toshiba    SD-3950          2003   $100.00       preown
Onkyo      TX-NR801        2004   $999.00      new
Sony         RDR-VX515    2005   $399.00       preown
Insignia     NS-HDTune     2009   $105.00      preown
Magnepan  1.7                  2011   $1,995.00   preown
Samsung   UN60FH6200  2013   $1,000.00   new

Your input is most appreciated and welcome. Thank you in advance.