I'd probably reraise pre-flop too.

Not sure about the turn. That 7 is very troublesome; it completes the heart flush draw and may possibly help a straight draw (although it's hard to imagine him having the cards necessary on this hand to make that into a straight). I would be very tempted to check behind and hope for a cheaper bet on the river that I could flat call.