Pinion angle question

That sounds like a reasonable approach, the process of elimination. You can always go back. Your driveshaft could also be the cause of vibration. Not sure how you would check that.