If the scabbards are repurposed to defending Wano from Orochi (if alive) and whatever his plans are with his army/Fukurokuju/Hotei/Kanjuro, then its still technically true.
Technically but look at it from a writing perspective.
Oda created a prophecy of nine people to fight and save wano (bringing a dawn to a moon that doesn’t know it)
Prophecies are literary terms designed to give a hint for the future while simultaneously subverting expectations.
9 scabbards; but they failed
9 worst Gen were shown connected to wano but 1s defeated and another mentioned he doesn’t want to go fight Kaido on the roof so it’s not them.
Throughout this arc Oda has kept the number nine present so I doubt he’ll just abandon it and make the final battle to bring forth the Dawn 5v2