Re-raise flop. He check-raised you, so he could easily have set of 7-s or Ax.
If you re-raise flop, then it´s not so hard to call river, because pot is bigger and you are pot commited
. He could have T8, but I think that the call is fine.
Reraise flop and push all-in on the turn would be best here I guess. You don't want him to draw you out.
Like you played it I think also the call on the river is fine. You have a really strong hand.