Have you ever considered port/polishing your exhaust manifolds, and TB?
They're all relatively easy to get access to, and once you see inside you'll be sick with how poorly the stock machining is. I heatwrapped my UP at the same time, and saw spool time drop by about 500rpm. Well worth the time spent.