Done! I managed to fit a stick type 8.4v battery in the front handguard. I ended up sanding down the inside of the handguard using REALLY rough sandpaper. I also had to shave down the underside of the outer-barrel too (pics included).
To shave down the barrel I started hand sanding but then realized I have a belt sander so that sped up the process a great bit.
In the end it fits by ever so tightly, but that also means its not going anywhere.
Didn't expect this much work