Thanks for the input guys.
I went with OFH in the end, it seems I have to wait 2-3 weeks for the next batch of OFH's from Asia to arrive.
Since I already have OFT, it seemed like a logical choice for me.
From my understanding, OFH3 is basically OFH2 with the integrated over-pipe. Might as well change it up while I'm at it.
Will report how it sounds and the gains I am expecting