Hi,
I'd raise the flop until all the money goes in.
As played, the board doesn't come so good for you since his minraise preflop + milking bets line postflop looks like a big overpair and now he has a boat with all of them except AA. If you minraise the river i think it's a fold when he shoves, but you're probably better off making a normal value raise and reluctantly calling it off the times where he does shove anyway.
Hope it helps.