Sorry,dude... I don't have an answer for you. But I didn't want you to think no one cared.
My solution to the battery thing was to relocate it under the tail. But... that's of no help to you.
I'd just do what it takes to make the thing fit and call it a day.