i had this problem prior to my swap....
id probably check the condition of the drive shafts....
my drive shafts were pretty much r00ted... instead of repairing them... i just got a pair of recondition ones to save me the hassles getting new cv boots etc...
with the old pair my car would start to vibrate on the highway at 80km's in 5th gear...