Finally installed Waterfox. I mean this in the best possible way: it's almost indistinguishable from Firefox.

I had to manually import my data (for some reason it wouldn't do it automatically at install) but apart from that minor issue, the transition has been painless and it's working exactly as I'd hoped.

Think I've finally got a new browser.