The whole mess started exactly because Haniyeh was a hardliner that wasn't willing to accept any previous agreements the PLO had already made.
Hamas took over Gaza shortly after agreeing to a unity government with Fatah.
The point is, there wasn't much of a difference between Haniyeh and Sinwar.
Yes, he was the Hamas leader in the Gaza strip.