I vote neither.
Build and boost your D16, beat both the swap options in horsepower and torque, plus keep all your stock a/c & steering components intact.
But I'm biased, I drive a turboD. P.s. let me know when you do the swap, I'm always looking for spare parts.
__________________
Now rolling in a partial zero emissions vehicle.