Preflop
Calling is fine. You could also 3-bet or even fold, especially in MP is a tight player.
Flop
Check-call is fine with second pair.
Turn
Checking is fine, and if he bet again, its definitely a call with the nut flushdraw.
River
You make the flush, but the board is paired. Its fine to bet for value, but maybe full pot is a bit to much.