Holyfield by around 5 spots. Better top wins and more impressive overall resume. Johnson's longevity makes it closer though.
I think both are over rated but Holyfield beat better fighters. Johnson never came close to beating fighters as good as Bowe and Tyson and lost to men in his prime that Holyfield would have likely beaten by a good margin.