That very much reminds me of the kinds of troubles I run into. Details... Just when you think you put the last screw in, you have to take them all back out again. I really don't know the answer for you, but my guess is that the 987.1 MAF is the one that you are going to want. Have a beer then a coffee (works for me). ...or maybe just another beer.