After looking at the availability of the cores in Japan, and switching to iron powder cores. I came up with the modified design (attached).
The impedance matching is relatively well, from previous design. I don't want to go above 1kV for now. I don't want arcs flying.