Belated welcome, Torontocity.
And... sounds like a really interesting project. You won't find me accusing anyone of having an underpowered engine! I'm of the opinion that my 49ish horsepower is excessive.
I'd gladly trade some of it for more efficiency.
I hope you'll keep us updated. Please start a dedicated thread and we'll put it in the Project Library.
PS - I spent my first 15 years in Scarberia.