Add the secondary o2 sensor would be the cheapest and easy way. Or you could get the p28 chipped and converted to a 5 speed and then tuned. But if its a stock swap i would just ad the 02