I know most of the votes are for keeping it as it is, but to be honest, I have the same problem as the person who first brought it up--I just don't see the spoiler warning until it's too late; by the time my brain has registered those words my eyes have already moved on. I just read too fast, I guess!

But really, nearly any of those techniques you mentioned would probably work--so it doesn't necessarily have to be linking them.