Yes, good idea.
But you will probably have to combine somewhat, otherwise there will be to many threads.
For now, then, re Capacitors:
Jeepers! Mr. Valve sells 500u + 500u/500V for about R150. High quality JJ, but do others have other knowledge? I did try Mantech, but at the time stocks were limited. Allied to this, folks will know that there is a maximum ripple current for electrolytics, and these specs seem to be a little hard to find for high voltage types. I got a brochure from somewhere by Hitano. I believe the size vs. max. ripple current will generally apply for other makes, if someone has doubt. One needs to be careful there with the quite small Jap types available.