Good luck on your rebuild is that's what you choose. I have to admit if I were in your shoes I'd go for it and get the services of a good (and known) machine shop. Yep, blueprinting, balancing and porting goes a long way to free up trapped horses! Who knows, you might just encounter someone that makes great custom headers too.

Keep us informed and take lots of photos!