The soap solution is up to you. But the best oil for dewatering is Bluing oil. It's very thin and is made to push water out of the crevices. Wipe, dry and add oil to your lubrication spots. It is pricey but it lasts forever. You can order from Brownells.

__________________
John 1:17
NRA Life Benefactor