Everything worked out to keep the gas tank in the original Samurai location.

I was also able to get a little trunk where the bug engine should be.

Right now the battery is mounted in the trunk for convenience. I hope to find a better place for it in the future.