Nah.
Luffy's EOS final fight is obviously Imu. Teach is too weak and ain't got the portrayal for it, his getting packed up next arc when Luffy raids Fullalead for Garp. The stars have aligned at this point:
-All of Blackbeards backstory getting revealed.
-Imu being made to fight Luffy via massive handicaps in Gunko and not Imu himself coming over, obviously because Oda plans to use him in person as the final fight.
-Loki's promise to destroy 1 pirate crew for Luffy, if Luffy frees him, which Luffy obviously will do, and the choice is gonna be Blackbeard Pirates. Luffy + Loki are gonna form a alliance to attack Fullalead after this arc, that's why Oda intentionally hasn't allowed Luffy to see the newspapers yet.
After BB is defeated in Fullalead, Luffy and remaining pirate crews will go to Laugh Tale, we already know Oda has set the plot device in motion for Mihawk with Buggy going after the One Piece.
On Laugh Tale it'll be,
Shanks Vs Luffy
Mihawk Vs Zoro
Sanji Vs Beckman
And so on and so forth
After Luffy wins, it'll be the final war with Imu.
Luffy V Imu
Zoro V Gandhi
Sanji V Mars (or somebody)
Dragon V Garling
Shanks OR Loki V Shamrock
etc etc