turn and river are kind of irrelevant re:shove or call given 1/3 pot left behind. I call river btw.

Raising flop might be best to balance w/ your overpairs, you also get it in vs worse FDs. Also some scenarios he will call and fold turn, so prob just best overall imo.