Installed the new gearbox, making the exact same noises so now beginning to suspect the competition clutch. Bit annoying to say the least.
On on a lighter note had it mapped again today more so I know what's really going on and to try and cure the high idle. Results: