Vibration problem

Here is what I did. I checked the wheel bearings, greesed and reset them as one seemed to be a little tight because it had no end play and I believe they should have a little according to the manual. The vibration is now gone but I have a bit of a whining noise coming from the rear. I am thinking that could be the wheel bearing so I might replace both of them to be sure. But before I do that I thought I would get some advice. The u-joints were replaced by the guy that did the tune up but I am not totally sure if they are correct so I have posted some pics in the hopes of someone telling if they are correct.
The u-joints messure 3 1/4",
the front and rear yoke on the shaft is 2 7/8",
the front yoke on the trans messures 3"
yoke on the diff messures 3 3/8".

1st pic is the shaft attached at the diff
2nd pic is rear of shaft
3rd pic is front of shaft with front yoke attached
Please take a look at the pics and tell me if you think they are correct.