Our current engine setup is as follows:

The 2008 engine is in development so these aren't set in stone:

Another option is re machining the head design, shrunken to the bore we use. (We have the CAD models). This would allow us to potentially use gasoline direct injection, if we can find a suitable injector.