I'd say shove on the flop. If he's betting like 1.75x the pot he's obviously gonna call your shove, and if a spade or a ten come up on the river, he probably would be much more cautious. I put him on a set/2pair/straight, so shoving would be correct in my op. By the turn though, calling his pot sized bet isn't +EV because you only have around a 25% chance of making your straight and/or flush, and the fact that you're OOP makes it worse because, again, if you check it back to him again when you hit your straight/flush, he may be smart enough to realize he should probably just check behind here, and if you were to shove at the appearance of a ten or spade, he could possibly fold. I think that he's a fish though, as he minraised you because he wanted you to call because he probably had AA, KK, QQ etc. so I doubt he has JT, a set/2pair seems to most likely.