Firefox could redirect from within
This should not be a problem for end-users if Mozilla add some code to handle the site 'upgrade' from HTTP to HTTPS automagically.
Firefox could simply have an option (off by default but with info on how to turn on though custom error handling) to automatically switch to HTTPS URLs when the HTTP URL does not respond (e.g. TCP port timeout or connection refused).