Grease won't fix anything, but it could narrow down where the noise is coming from.
It sounds to me like the forward thrust bearing is toast...
Did you change out the U-joints when you had it all apart? That will be the easiest to repair, but the joints aren't what i call cheap...
Wish I had some extra time, I would cruise up there and throw an ear on it for you.