Have you taken a close look at the Intercooler pipes to see if there is any wear?
I have a similar issue but it only seems to kick in after being out on a longish drive. After changing back down to 2nd or 1st at junctions, I get a lag when I put my foot down, it's pretty annoying and it's not...