Although I would prefer the far more radical (and thus far more
unlikely to ever happen) approach of actually renaming 'fmap' to 'map'.

I'd vote for that too.