I'm also thinking of recapping some of mine G3's, just to be sure.
Because of the cost and work involved, I wanted to limit the recapping to the caps you found to be leaky. I'm at least replacing the 5 3300uf Samwha caps in the PSU. Do you remember what the value of the 2 Chemi-con caps was...