I agree, but Amado could perhaps bring him back. Amado isn't a fighter so I'm more inclined to believe he'll orchestrate the events that will bring the final "combatant villain" while still also making him the final villain
I have an Amado theory posted on my channel but it's a bit outdated already, but it does a nice recap of his story if nothing more. Title is "Amado - FULL Story & Theory" But i suggest you check out "FULL THEORY - Codes white karma. It all makes sense!" This is my most recent full theory video, and it's a large part of overall Amado theory. In the next two weeks or so I'm also posting a theory about Akebi, some explanations behind Amado name and what it might mean for the story. After that I'll be posting a full updated Amado theory.