Turns out this is going to take more rework than I initially thought. I made myself a roadmap and then started taking things apart to test fit in the new enclosure. It will work! Just need to finish the graphics and etch, then I can put it all back together.