I use MP Pro-7 cleaner and lube. I would most likely use a taper pin if I were to pin it in place. Bumping up to a larger set screw seems like the most reasonable course of action and is something I can do myself.

Sent from my SM-G920T using Tapatalk