Honestly you're pretty spot on. I use the fingerprinting setup you use except I opt for NoScript and use Librewolf. You can also enable letterboxing in about:config to prevent screen resolution/aspect fingerprints.
I keep Noscript off usually, but if I'm browsing sites I don't know or frequent I turn it on for the added security. For anyone aware, turning off Javascript does increase your fingerprintability, but also makes you much harder to target via cross site scripting or through trackers from outside sites (e.g. google, facebook, etc.).
Also, very interesting info on I2P. I've never looked into it, but it seems like an interesting concept