Rather than disrupt the content of the lead paragraph, instead we should promote these to first class citizens.
The change would look like this:
and arguably results in a much cleaner version of the existing process of moving the lead paragraph:
See for yourself here: https://trending.wmflabs.org
In particular notice how the hatnote appears twice in this example:
The second instance would disappear with this transition. I've submitted patches showing how we could do this while keeping backwards compatibility.