Waterfox seemed a bit too opinionated as well, especially in terms of extra code, weird versioning, patch delays.