Speaking of scope creep. Look into AEG exhaust manifold. With minor clearancing it mounts to a 1.8 head. I had a collector made by Maik Jankord.  Using 2.5 inch pipe with two flex joints. I will install it this fall. It beats the standard toilet bowl collector I currently have. 

Pic of collector: https://www.thesamba.com/vw/gallery/pix/836852.jpg

I already installed a Neuspeed cam/adjustable gear and Digifant 2 chip. It bumps the power nicely. 

Chris