The river two doesn't change anything, and while I understand you were probably raising the turn for a free showdown I think the Q is probably good here. He could have AQ, KQ, QJ here since he raised PF but unless he's really scared of a 4 hes betting those hands on the river. If you get c/r on the river you can throw it away, but I think you have to bet here.

Steve