Hey Will,
I'm in the exact same situation as you re: upgrading. One chassis option may be the new Magma PCIe > PCI 6-slot
HERE .
I hope to dig up some more informed opinions in the next week or so... I'll try to keep you posted.
Warmest Regards,
Brian