Bummer, glad to hear you are OK so far. Definitely get yourself checked, my wife was in a wreck last December, and is still in pain. Been treated by the docs since the day after the wreck. In her wreck though, there was no warning, this woman crossed 3 lanes of traffic to go to a shopping center, and my wife broadsided her going 40MPH. There were 2 large trucks in the other two lanes, and my wife's lane was clear until it was too late. She came to a complete stop from 40MPH in about 3 feet, set off the airbags, totaled the minivan, all in all could have been a lot worse.
If you do go with the diesel, how is it with putting a turbocharger on over there? A small turbo would boost the power to the level of the gasoline car, but you should see better mileage being a diesel.