I agree with what Geoff has already said. For larger displacement, maybe think about going to 36 or 40 Dells, or Webers.
And I would like to add, that if you come the Great Canadian VW Show, keep an eye out for Tom Hansen's T3 Notch. It will give you an idea of what is possible.