I have a FT-950 which I use daily. I have an Icom 7000 which I use for VHF/UHF and a few contacts on HF.
For your compact closet station an Icom 7000 would be perfect. Mate it up with a switching power supply, auto tuner and you are good to go. Built in keyer, good DSP and filtering, small foot print on the operating desk.
The FT-950 would also be a great choice, but it would take up more space on the desk. Since you are in the closet I am sure space is tight.
I know you love CW but you should also look at the digital modes, lots of contacts to be made. But then you would need a laptop in the closet to operate those modes.
Now if you want to make a deal on some of your boat anchor equipment you know how to get in touch with me
For anyone reading this thread Joe and I go back quite a few years. He took me to Dayton years ago and then he came here to operate FD with the club I was involved with back in the mid 90's. So we go back a few years.