What front pipe and dumps do you have?
Do you have inter cooler hard pipes?
The shuffle shouldn't be that bad. it happens occasionally to me.
Does it happen when you are going up a hill at part throttle coming onto boost and just holding it there? But you can drive out of it if you put your foot a little further down?