On original question +ve to top see image of mating connector viewed from "flat" side.

On PSU issue generally they are such a pig to get out and apart it is worth replacing all the small electrolytics. The big HV ones are generally OK. Just checking ESR is not enough. I'm not generally a fan of "shotgun" electrolytic replacement but decided to do it on the very similar PSU in my 8920a (worth looking at the 8920x PSU diagrams there aer some on the web). when I had it out following a main switch transistor failure. While all the caps looked OK and checked for in-circuit ESR (several are in parallel) 3 had started to leak th in one case the PCB was starting to burn.
?
Robert.