As long as the bearings do not have excessive play, re-greasing is sufficient. I also have original bearings on my 2005 as well. As for the dirty wheels, perhaps you can just change out the seals and new caps. That did wonders for my perpetually dirty wheel situation.
Now they're squeaky clean all the time unless it rains.