This is a super old post but I felt it was worthwhile to update the above comment a bit in case people end up using it for reference or help and also because of the UASF issue, I wanted to post this comment and provide the below guides.
3) If you are not running a full node in Electrum you should at least be using client that enforces BIP148, here is a post that describes how that may be helpful: