Hi,
I'm not a very experienced engineer but from what I know and based on your image, just gonna throw my ideas, I can think of 2 simple things (I don't think anyone mentioned it but if otherwise sorry).
1) Wouldn't a Y-delta transformer clean out the triplens harmonic ? so you would get a...