That's what it sounds like based off the spoilers. Gotta wait for the chapter to see, but this has typical Oda all over it. This is not meant to dehype GB, a lot of people gonna be disappointed if that's what they're expecting. It's simply Oda throwing the kitchen sink at GB to force him to finally leave, he's doing all of this against Akainu's orders to make things worse, so tackling an entire Yonkou crew while he's dealing with an alliance that took down 2 Yonkou behind Akainu's back would be incredibly stupid even for him. Oda simply avoided a nasty situation by inserting Shanks, since we all know damn well no one is taking on that alliance, and we know damn well Momo and the scabbards weren't stopping GB either.
Oda had his cake and ate it too. Promoted Shanks (bonus for incoming movie), hyped GB (at the cost of shitting on 2 commanders), hyped Momo. No one worth a lick moving forward (rip Queen/King, commander era is over) really lost face, but no one really did anything either. That's what this is looking like rn.