Actually, now that I switched the tank, theres lots more room up there...
I might be able to fit the internal waste, with a bit more creative charge piping
One thing I also hadnt taken into consideration, is the heat offput by the turbo, right there by the tank...