IIRC the other edit didn't have Coulson go to NM until people were already camping around the hammer and then he put the rest of Iron Man II in (and some other scenes) before getting to A Funny Thing... then immediately having Coulson arrive (no scene between the two).
It felt really odd time wise. Sounds like your way will be better.
I can't believe I sat through all of this a few days ago, and still can't wait to see your take.