I like the idea of re-theming it to be in keeping with the feel of ToT and Sunset Boulevard as there's nothing intrinsic about it that it has to be a modern rock-band theme. Don't know if people are familiar with the the NoLimits Terror Tracks project, which reimagined the Tower of Terror story as though it was a coaster, as a tribute to the California ToT. This was so well done and gave me chills. RnRc can't be re-themed in this way because, well, it's the same story as Tower of Terror and Disney wouldn't implement something that's already been dreamed up by someone else. However, it shows how the ride could be better fitted in that area. Either that, or as people have said, that corner needs to be cut off from Sunset Boulevard, made part of a land behind it, and re-themed as something else.
Keep watching to the very end. Is there something in your eye?