I probably raise the flop. The turn can come a scare card (like it did) and prevent you from getting all the money in so it's probably better to get as much in as possible on the flop. He's a bit short so both lines are ok.

EDIT: He's not short at all, raise the flop. Raising the flop looks more like a bluff too.