Golota and it's not close. Chisora made his name doing well in defeat (yes, one was a robbery) against one-armed foes, and the infamous come from behind 9 count KO. But he never was more as a gatekeeper in my eyes. Golota on the other hand was more of a screwup (Lennox levelled him to be fair), despite his obvious talent. But he screwed up when it mattered, in big fights. Case is, Chisora wouldn't be a big fight.
Golota should win, on paper. But you have to take into account Golotas mental weaknesses and the fact that Chisora is quite an aggressive, mentally strong, pressure fighter. If he didnt back away from Vitali, what makes anyone think its going to be easy for Golota?