Yes, because imo, if Shanks is the endgame fight for Luffy, then Mihawk is probably right there with them fighting Zoro. So on that front it can make sense why Luffy and Zoro are equated with AdCoC this way, as it still may be required for potential final opponents like them.
Personally I think the following may happen for Luffy and Zoro's fights:
- Elbaf is Kizaru/Upgraded Kuma to tie up Vegapunk plot and Zoro's plot with Kuma.
- Laugh Tale may or may not be Blackbeard/Shiryu, if not that pools to the final war
- Final War could be Akainu/Fujitora and Im/Monk Gorosei at New Marineford/Mariejois
- Final Battle (God Valley?) could be Shanks/Mihawk
But a lot of people think I'm nuts for this line of thinking lol. Maybe I am, maybe I'm not.