For the transformer leakage energy, you could use a diode and capacitor to catch it, and then a little flyback smps to feed off that and keep draining it down so you dont get overvolts.....ie, a kind of active snubber.
Otherwise, if those leakage inductances are small, you could just use an RCD...