as stated get the redesigned heads. It depends on how you are going to use it. If you are going to drive lots of miles from rally to rally or something like that then get diesel. If you are going to head south for the winter and stay in one spot or one area for a while, drive under 10K miles a year then gas is better.
Diesel at 8 mpg 10K miles $4.00 fuel is is 5K
Gas at 5 mpg 10K miles 3.50 fuel is 7K. how many years will the difference in purchase price between diesel and gasoline take.
I have observed the quality of the body and other parts is much better on the diesel units too.