I strongly doubt there will be a VW diesel hybrid in the next 2 years or soon. Diesel is great for highway, hybrid is great for short trips. Combine them and you've got a really fuel efficient, complex, heavy, and expensive car that will require high fuel prices to sell well. They probably built the VW Golf TDI hybrid as a concept car and will make a gasoline hybrid. Don't forget the 1.4L turbo and supercharged Euro engine that would probably be a better replacement for the 2.5L gas engine now.
I also strongly doubt the wagon will change for the next 2 years. As Joe said, it was only new to the US for 2009, it's been around for years. And the 2011 Jetta sedan would come first followed by the wagon later. The A5 VW Jetta sedan came in model year 2005.5 but the wagon didn't get here until model year 2009. I suspect they will work on the NMS (next/new midsize sedan) Passat replacement before the VW A6 Jetta wagon.
I do believe that the TDI engine will still be available in a 2011 VW Jetta TDI but I haven't read any confirmation that it will be for 2011 or 2012 or if the engine will change much.