I got a Gen 3 so cannot help, but cannot wait to see what Dave6666 post's in response.
Actually, I've been reassigned by Jon B at Parts Rack, a company I no longer do business with due to endless problems, as just "666."
It does sound like a u-joint noise possibly, but the rock in the tire thing is a freebie to check. Gears don't usually click. They whine, grind, and moan. Kind of like when Chad locks up his date in the trunk on the way home from *******.
Anyway, the best place to get the u-joints is:
5-799X - $20.89 : Shaftmasters, Quality Parts and Service at a Great Price
You must be registered for see images
DON'T skip the strap and bolt kits:
3-70-28X - $4.48 : Shaftmasters, Quality Parts and Service at a Great Price
Those are what my '01 uses. You should confirm that your car uses the same joint.
Have a good 8mm socket and wrench handy for the screws on the clamps. They are fun.
Also though, check your brake pads and mounts. I've got a car that the front pads like to click on. Have never figured out why. Just a thought.