I had 2 new drive shafts made & they vibrated similar to your findings on my S2 30+ years ago, I had them checked & we found both driveshafts running out of true, had 2 new ones made properly by the company that checked them, we still use those people now, always good.