Originally Posted by Thooks
Ok, thanks.
I wanted some feedback on my situation to firm up my thoughts that a simple brake job would correct the problem.
Yep, shake when braking is definitely bad rotors. Shake when not braking could be misalignment, unbalanced wheel, crap stuck in your tire, etc

I like to always replace the pads when I replace the rotors if they get warped just because I'm down there anyway and pads are pretty cheap ($40/set for OEM).