And if you honestly believe that after a decade of fighting at the highest level and multiple knee surgeries, he was in "the best shape of his life", than I suggest you never go car shopping by yourself.
As for Overeem, he dropped Stipe and ko'd JDS and Hunt while presumably off the juice, so why you think that plays a part is beyond me. Overeem has ALWAYS had mad skills, the juice just gave him that extra strength to bully and crush people at hw. I doubt a 255 lb dude needs that to beat stringbean Jones though. Jones is not a power puncher, and Overeem's only weakness is his chin. All of his losses in the past decade have come by way of ko to heavy hitters.
Look, Jones is a hell of a fighter, but to claim that he would beat Overeem when he had a war with Gus is ludicrous. The only way Jones wins that is if he adds about 20+ lbs of lean muscle to his Skeletor frame, and who knows how that would affect his fighting style.