Z800 Power Supply replaced with Z840 Power Supply

I have 2 failed Z800 power supplies (1150 watt version). After some internet research I am led to believe this is a common problem and related to the PS capacitors. Since I do not know how to do this capacitor replacement (yet). I thought I would buy a new PS. However, I do not want to buy a Z800 PS since it seems to me to be a defective design. Can anyone chime in and tell me if the new z840 1125 watt PS will work with my older z800?

I have called HP support and spoken with the correct support people on this and they were not able to confirm if the Z840 PS will work (fit) on the z800. The closest confirmantion I recieved was that if it fits then it should work.

Instructions to fix the capacitors:

http://h30434.www3.hp.com/t5/Business-PCs-Workstations-and-Point-of-Sale-Systems/Z800-power-on-issue/td-p/5071924/page/2

Same issue I am facing:

https://www.youtube.com/watch?v=f563JGeoxaw

On a side note, can anyone recommend a good service tech to make such capacitor repares in Southern California or insrtuctions on how to make this repair (with pictures).

Thanks