Wiper Motor Lube and Maintenance

I have used small 4-40 machine bolts and nuts in place of the rivets. I use Aeroshell 22 synthetic multi temp grease on stuff like this, but I work in aviation.
Ill look into those machine bolts. Is this motor something I do not want to get into? Im tech proficient just not the best at fab stuff.

I have a good synthetic grease but I don't know the weight it can carry. Probably fine for this but definitely not a ball joint grease.