Again, 2.5 litre short motor.. drop it in, verso it, done.

You can spend all that money strengthening it, but it still has the 5 speed in it!

I reckon start from square one, swallow the Subaru verdict, and go with another stock motor.