seems like you figured it out but heres my input
hard to diagnose from a discription but i will tell you what i do when i hunt down vibrations...
1. rebalance all wheels and tell the TECH doing it to tell you if he has any problems or if the tires are warped
If it only vibrates under braking;
1. replace rotors/pads or turn the rotors. You can also check the runout on the rotors with a dial indicator
2. if that doesnt work check and or replace balljoints/tierods
3. if that doesnt work check and or replace all wheel bearings
If it vibrates all the time;
Again make sure all wheels are balanced and tires check out
1. check and or replace balljoints/tierods
2. check and or replace wheel bearings
And yes make sure all driveshafts are good before doing all this, also check the front diff, tcase, rear axle, and tranny output shafts for play