Is mapping around the ECU boost limit going to always be a factor in the back of yours/Marks mind. After all this is the final time and your surely going to always think 'what if' if the current setup ECU doesnt provide the goods on the day. I know its a case of where do you stop but new engine, new goals deserves that new ECU .
Is it really that much aggro to change it? Sounds quite a radical change none the less going by your standards.