I was at least able to verify that the original caps are indeed Clarity Caps SAs as I am almost certain that this is the first re-cap these 3.6s have ever experiencedYou must have very late production 3.6s. I would have guessed Thiel stopped making those before Clarity introduced the SA. Interesting. The SA is a good cap but, as Tom Thiel wrote, the CSA is a step up. The CMR is supposed to be even another step up. But those are much larger, possibly requiring a new board to accommodate their size and much more expensive. My new boards have 630V versions of CSA on the coax feeds. It would be interesting to compare 630V CSA to 400V CMR. There is a 630V version of CMR but those are bigger still and more expensive with a smaller range of available capacitance values.
You probably have high quality coils but I would replace any sandcast resistors with Mills MRA-12s.