I'd separate my storage and put that in its own server.

Then, I'd probably go for multiple low energy sff "servers" instead of one powerfull one.