CLASSIC versions of both
That would go to Capt Comet.
His physicals in Classic Era were very close to Superman. When he finally allowed his full physical evolutuon to occur he could give Supes a good fight.
https://static.comicvine.com/uploads/original/3/30145/4450996-dc%20comics%20presents%20%2391%20-%20page%2015.jpg
https://static.comicvine.com/uploads/scale_super/3/30145/4565673-dc%20comics%20presents%20%2391%20-%20page%2014.jpg
TK (mind over matter) wise he was powerful ebough to use ro control the energy of power rings against their owners.
https://comicvine1.cbsistatic.com/uploads/original/3/30145/6576920- mental%20force%20stronger%20than%20a%20green%20pow
er%20battery%20.jpg
https://comicvine1.cbsistatic.com/uploads/original/3/30145/6576639-secretsocietyofsuper-villains_05-17.jpg~original.jpg
He has also done this to Kyle Raynor in more recent years (non "Classic"
as well as TK shielded from Ominar Synn.
Thats not even taking into considerstion his TP. Which admitedly isnt as high as Adam Warlocks but then he did TP overpower more powerful TPers often enough.
I dont see classic Adam Warlock besting him. Magus or with soul gem maybe but not classic.