I do a lot of custom building with a focus on compact builds and high performing graphics. The Compact-506s with MachDSP amps and their 3.2A per channel PSU have the smallest footprint you can get for 40Kpps graphics. The 506's cost much more than what you put in there, but the ability to scan really wide and accurately at 40Kpps is very rewarding. In that build, you'd have to do some rearrangement of the components, but you obviously have a good eye for laying things out. That said, making a new build and relegating your current build to beam work in a small space is another option. You can't have too many lasers!
Happy building/upgrading!
-David