23-window Type II. You'd never regret it. My panel van with 1600cc boxer with dual Solex 40 carbs and an extractor exhaust got 30mpg (at 55mph during break-in. Never went that slow again). Substitute a TDI four and you'd see ~40mpg.
Plan B: a Westfalia Vanagon.