Master Cylinder for Mark20-ABS: Which Fit?

Hello!

I installed G60 brakes on the front and rear, and originally, the vehicle came equipped with the Mark20 ABS system and a 22.2mm master cylinder.



I now want to install a larger one; there are still (very rare) models of the Golf 3 with a 23.8mm size.

So, I either need to get one myself, or could I also use one from a Golf 4?
They also have the Mark20, but usually the Mark20i (with EDS).

The question is whether the master cylinder from a G4 or S2, or something similar, will fit. Or, at the very least, whether the brake booster assembly (including the master cylinder) will fit (because those from the Golf 3 and similar models are more commonly found).

Thank you very much!