Be duly warned Alan, never tell a doctor in the UK what you actually drink (the quantity) as the NHS etc. over here are all of the opinion that anything more than a thimble full a month is akin to holding a gun to your head!!!!!!!!!!!!!!! BONKERS
Up until recently I lived in France where the health service expect you to drink, they expect you to eat fatty foods and most of all they expect you to lead a happy and full life. In fact my doctor ate and drank like a good-un yet well into his late 50's he was still mountaineering, he was still running marathons in fact he was as fit as a flea.
But as for you massaging olive oil into your joints, yes that is a good idea most especially if you then wrap a warm poultice around your hands afterwards.
Good luck to you.