Restoring my old HP8594E?

[Miti]

My fingers tingle again. After the successful complete recaping and upgrading to FRAM of my Tek 2445B, I feel that it is time for my HP8594E SA to get a rejuvenating treatment.
However, I don't want to make things worse. The instrument works, but the screen gets a bit fuzzy with brightness, a clear sign of an old CRT.

The question is, should I try rejuvenating the CRT, and with that occasion, replacing the caps in the display module?
Also, should I replace those Rifa caps, and the electrolytics, in the power supply, before they do their firework number?

What do you guys think? Should I jinx it or should I not?

Thanks,
Miti