Luxman L-530 or Marantz PM-84 II

Need some advise on the above 2 integrated amplifiers. Long story short, I have both of these and really need to decide which to keep.

The L-530 drives in Class A mode in the first 15W and had Black Gates (30,000 micro F) and Elnas put in in the last 12 months and re-biased. There are a couple of upgraded RCA ports and new speaker binding posts.

I just acquired the PM-84 II which is supposed to do the first 25W in Class A and sadly, it's throwing out some static and noise whilst playing after about 3 0minutes. In the brief moments I listened to it, the Class A portion seems to pack more punch. It does run hotter (76,000-micro F) than the Luxman so I reckon it's 'purer' in that sense? I'm not sure what's up with the internals and kinda' hoping it's just some dirty contacts. Assuming that's the issue, it should be a cheap fix and I might just upgrade the whole gang of RCAs and speaker binding posts. Then again, maybe it involves dried up caps and those will be more costly to rectify?

I'd really like to get both the amps playing and deciding between the 2 to keep one. But I gotta be realistic and before I invest in restoring the Marantz, I'd like some advise on which is of better specs?

Luxman L-530: http://audio-database.com/LUXMANALPINE-LUXMAN/amp/l-530-e.html
Marantz PM-84 II (PM-84D): http://audio-database.com/MARANTZ/amp/pm-84d-e.html
http://www.dutchaudioclassics.nl/marantz_pm84-mkII_amplifier/

Should I even bother with restoration of the Marantz or stick with the Luxman? I'm more of a listen with my ears kinda' guy but will like some help making sense of the specs.

Thanks in advance.