I doubt that the vibration will be an MOT issue as they don't take it up the road.
But get it sorted as it will eat the UJ's. As said above a double decardon prop from a Discovery 2 will allow for the increased angle from the transfer box to the front axle.