Your main problem is the chassis...
All you need to do is make sure the rear-most battery slot in the chassis is chamfered out correctly, and those batteries will fit like a glove. Hit the chassis with a file enough so that the cell fits down in the slot like it's supposed to, and your problem will be solved.
PM me if you want a pic of how mine is done..