You would get better value out of the i5 imho. You're saving $100 for not that much noticeable performance increase plus I see more i5 + mobo promotions around.
Ha ha, I'm still using the same Zalman CPU cooler from my 1st gen i7-920. All I did was just change the bracket and it keeps it nice and chilly.