Nice tank!
I'm going to look at this TDI today:
2001 VW TDI BEETLE
I don't know what P & G would do to a diesel, but I'd definitely EOC up to every light. Even with a mostly highway commute, if you EOC, your next post will be "Broke a thousand miles on this tank"
I increased my mileage by like 10 mpg just by shutting mine off at lights, but my commute has lots of lights.