My old 93 was doing the same thing, exactly like you were describing, I though it was the sensor or pump...2 days later I dropped the oil pan to replace it (previous owner had an oil pan from his old boosted z6 on it) and found this, Instead of going any more on the Z6 I went ahead and ls swapped it...

Metal pieces, some almost 1/2 inch long