A 54 235 or 261 would be the easiest swap since you wont have to deal with the water pump issues.