I was the same until a few days ago when I finally took the time to switch to a real password manager. A HN'er recommended Bitwarden[0] and I have to say it was pretty painless and I am much happier knowing my passwords are with a third party (not that I have any real issue with Google but I did worry about having all my eggs in one basket as such).
I haven't paid for Bitwarden yet but I plan to providing it doesn't have a massive failure in the next couple of weeks. Looks like it will easily be worth the $10/year though.
Another added bonus is that their Android app is very decent as well and so far has worked with all my apps as well which is handy and not something I had thought much about in the past. Makes life that little bit easier although I don't have to enter app passwords much in Android it is nice to have the option now.
But back to Firefox - I checked out Nightly when it hit 57 a while back and was extremely impressed. It felt like a whole new browser. Not sure if I will switch from Chrome just yet but I am excited for the future of Firefox again.