Move weapon mode/mod display to after weapon name.

IMO fixes #3447 enough for a release.

The weapon name with mods can still overflow, but it already overflows with long weapon names anyway,
and now at least it doesn't overwrite the pain indicator.