I make those changes, too! Without even meaning to, about half the time I sing it "I wanna tell him that I love him but the point is probably moot." The song just slashes itself, really.

And, frankly, I would love a vid in which Kirk and Uhura fight over Spock, as long as it ended with them realizing he's Vulcan enough for two. *dreams*