I agree, the Diesel may have fallen outside the scope of what will come in '07. It would have an easy fit, since they will be offering one for Europe next year, but Diesels are not that popular in the US....at this time, but they are growing in popularity.
The V8 does require a major redesign of the dash panel (firewall) location, and it will be a lot of fun to work on.
I believe the only big change you will see with the release of the '07 model year will be the increase of about 25 hp.