You might also consider upgrading/modernizing the convoluted intake/diverter valve, especially if you're going to go with a long neck intercooler.
Again, Turbokraft can help you:
https://parts.turbokraft.com/products/930-high-performance-long-neck-intercooler-package