jzmuda

I have a 97 A4 Quattro V6 2.8L it ha 168K on it and recently it threw a code of P1504(bypass valve leak), P0103 (MAF signal too high). I replaced he vacuum hoses on the solenoids, new ICV and a new plate that it bolts on to, sprayed the entire intake manifold with carb cleaner while running and there wasn't any difference so no leaks anywhere. After the car warms up it runs rough or it just dies out. It will restart but it takes good 10 seconds of cranking before it starts up again. Then if feels really sluggish but it runs better at high Rpm however when I was on the highway the other day around 2400-2500 rpm it surged and it wanted to die out and then it was fine again. Any suggestions recommendations, I have the VAG-COM scanner is there anything I can use there to test out the sensors? Please help I don't want to buy more expensive parts for nothing.

Thanx in advance
Jerry