> I agree that all four modes above should stay enabled on
> revert-buffer, including hl-line-mode.

I agree, too.

Other modes to consider: visual-line-mode, so-long-mode and indent-tabs-mode.