That's sweet. Great attention to detail and it's a real beauty.
If you get tired of the 9v, this is the place where lipos come in handy. I have squeezed them into the Kubel trunk, the Kettenkrad body and soon a Schwimmwagen. I'm not one to throw a lipo in something that could take a NiMH, but in these cases it's well worth the extra attention/risk. At this point, you can pretty much pick a 2 cell by dimensions to custom fit any need.