Okay so I wanted to see if the porcupine removal concept was of any value. So I loaded the ZSE version in Womble and started editing out.
I went very quickly and I'm probably a lot less talented than you on this tool but it DOES work.
Basically I cut all of the second killer footage (Police Car explosion, Hoverboard... and sadly... second Quickening). There are a couple of music cuts that I'm not too happy with and likewise I did not refine the beginning of the scene with an extract with the punks, like I said I would... maybe next time.
By keeping the 1st attack in constant motion (never stopping more than a couple of seconds on an immobile shot of a porcupine), it looks like 2 punks calling out on an old man and one of them performing a random attack on him... much better than Katana sending these clowns after the Highlander.
I encourage you to give it a try. My God with your cuts and mine, could I finally watch (and enjoy) H2 at long last ?