I'm going with Boots Ennis. Even though the quality of his opposition has gone up he is still stopping people inside three round. Ortiz' fights are now last about twice as long..
Ennis 100% and very clearly Otiz's power is overrated, it took him 9 rounds to stop pillow fisted Michael Mckinson. Ennis would destroy Mckinson in 1 or 2 rounds.
As another poster said, though the Portsmouth man is tough and game, a massive puncher wouldn't have needed to beat on Michael McKinson as long as Ortiz did. Ennis, meanwhile, seems to have the capacity to discombobulate fair opposition with even glancing contact. You don't just flatten a man as tough as Mauricio Herrera (even that faded, blown-up 2019 version) if you don't possess a more than respectable punch, but Boots is the clear pick here. If he can take it nearly as well as he gives it, he's going to be very tough to beat.