Have to agree with Mad Dog. The queue helps keep the ride from being a complete disaster and losing more team member interactions/performances would be a bummer now that there are so few left.
Probably just need to get used to the fact this will be here for the next 10 years completely unchanged.
In a dream world, they'd use the sets already built, which are pretty nice, and convert it into a test track or MK clone. That's not happening though. If they cared that much, they wouldn't have brought the ride in the first place. Could you imagine how amazing this ride would have been with a test track and MK fusion? Test track with drifting and an enclosed back portion would have been an award winning attraction even with the terrible F&F cheese still there.
This ride and a few other decisions as of late really only made sense when Nintendo was coming to USF.