Cool, looks nice and thanks for sharing.
I suspect it can’t fit all together to the current enclosure, since the enclosure (Serpac 032C) isn’t very high. However, if you have some way of making cutouts yourself, you can get Serpac 033 or 133 enclosure, which has extended height and I believe can fit with the base of 032C enclosure:
http://www.serpac.com/sx3x.aspx
Digikey and Mouser both have these enclosures at very reasonable price.