My Vigor drives pretty good and gets me a consistent 25mpg in the city. It would probably be better if I didn't have a heavy right foot.

When you are doing the swap, now is the time to replace all of the gaskets that are hard to get to while the motor is in the car, such as oil cooler o-rings, o-rings on the pipe that goes through the oil pan, etc.