My car did not give the proper codes either - sveeral trips in to the garage and they said they were not sure it was the PNP because of codes... but the symptoms matched what has been described over and over as PNP failure here. Finally one day while the arrow was still flashing and the symptoms were happening I got it in to the garage and sure enough all the right codes were there, they replaced the swicth and away I went never to have that problem again!

If I were you I would simply replace the PNP, it would probably fail eventually anyway so if it doesn't fix the problem at least you have headed off a future problem!