you got a B16. Why would you want to swap?

And if you work on the weak points the engine should be fine