You know, I think I agree with you... Or at least, it feels like it would fit better after Marineford than at any other spot in the series so far.

The only thing that doesn't fit would be that when Luffy wakes up and is himself again, there'd still be a huge lump of sorrow and grief - a weight he'd acknowledge even as he's recovering and his crewmates make it better. Or that's how it seems to me right now, at least... But it feels like everything before that would work the same way.

I'm very, very happy this managed to give you some comfort right now.