I like a leadout on the flop. If you take this route you will get more information without losing the fish. Your hand is likely much stronger against the fish here than against the good player, but you have no information yet about how that flop hit either of them. I don't like the position you were in for the rest of the hand because of your play earlier, so it is difficult for me to suggest plays from this point forward.
I definately disagree with the check call flop, check raise is better.