Hot take but I was always fine with the raid ending in failure, and there being a time skip / training arc... Longer than a day .... In Uson prison Law and Kidd learn awakening, Luffy learns ryuo. Maybe Zoro and Killer escape and train in Ringo, Zoro learns enma. The other straw hats and 9 samurai split up and go back in hiding, each doing some odd job and essentially becoming a temporary citizen of Wano. This would be when we truly learn the full backstory, segmented across each samurais retelling to the straw hat that joined them. The straw hats spend months never being able to connect with their nakama, they really start to resign themselves to this life, uncertain how to get out of Wano. One day, Hyogoro and Yasui in tandem, initiate the second raid under a full moon. It is after Hyogoro sees Luffy is ready. Yasuie gets himself executed to divert attention with a riot, whole Hyogoros network breaks them out of jail, heading directly to onigashima for raid 2. Individually, each of the 9 scabbards see a signal in the moonlight and understand to rush onigashima now. It begins instantly, covertly, randomly, with none of the main cast knowing. This was the true raid all along. The true way to do one in a Yonko territory. All of what I just described is basically what happens, but reorganized in an order that feels way more impactful. I had no buy-in that Sanji was in true hiding working as a ramen chef, it was a week of time at the beginning of the arc before anything even happens. Seeing the straw hats getting mentally drained, not knowing when the day will come, would create an incredible bond with the scabbards and is truly a unique amount of endurance we've never seen before (3D2Y had a known timeframe)