NSS had to adopt a fix for accepting bogus DH groups; was Firefox just not willing to accept a renegotiation under a different server certificate, or is something else going on here?
The DH fix was just a sanity check and are not sufficient to prevent pre-master secret fixation with DH handshakes.
Firefox enforces that the renegotiation certificate chain are valid for the site name which solves the renegotiation issue.