They claim the 6.4L engine will be available in model-year 2008 trucks, starting in early 2007:

http://media.ford.com/newsroom/release_display.cfm?release=24088

I'll agree with you on this: Ford has really screwed their customer base with the 6.0L engine, the problems of same and how they handled customer relations during this time. What is more than that is how Ford just can't seem to get the idea of a V-8 diesel out of their head. I know of no V-8 diesel engine that is as good as a I-6 configuration with similar horsepower. I'd take a Cummins B5.9 over any of the V-8's used by Ford or GM in their pickups.