Summary

The original was a great idea, the model just seems to have a couple issues.
I fixed the rear lower angle, it was separated from the main body.
I fixed the slots on the front where the buttons go.

I still have to print it to ensure everything in the new model fits.

I did the work with Sketchup and TinkerCAD.