I'd rather see Universal gut the Supercharged show-building and build a high thrill-level coaster with the indoor and outdoor elements that many have suggested. It would keep F&F, one of Universal's biggest franchises, at USF while also eliminating a mediocre attraction.
If MIB/FFL/Springfield ever gets replaced with immersive lands, I doubt there will be a coaster that is high-thrill. Maybe something similar to Hagrid's, but that's about it.
HRRR being re-themed to F&F is a mistake imo. If that's even a real idea proposed by Creative, of course. At this point, I think Universal needs to either give it a major overhaul or tear it down. A light re-theme ain't gonna cut it.