I am going down the Loctite route as well!
Thank you!
PS: I have updated the schematic for future use by others: