Team 7 was fighting with Zabuza and Haku, but then Haku died from a Chidori to the chest (sound familiar?) and Zabuza went on a rampage against Gato and his men.
Could Obito do to Madara what Zabuza did to Gato and his men? Of course Obito isn't strong enough to kill Madara, but maybe I'm sure he'll do something to stop Madara and then have a Zabuza-like death.
And yes, I think that Zabuza and Haku's demise were one the best written deaths in Naruto. u_u