A major overhaul was ordered, and some new brake pads requested.
I got on the machine for the first time today, and wow, it felt brand new again. A new shifter cable was installed, making shifting crisp and quick. The brakes were dialed in, and the whole bike was clean, clean clean.
I should have done that a long time ago.