I agree with your play here. I don't have a problem with just calling before the flop. After he moved all in if you are confident that your read on him is correct, then you should call is all-in. He hit the card he needed on the river and stuff like that is going to happen, but you got your money in with the best hand.