I might have just completed, but I don't mind a raise either. I probably would have pushed the flop over his raise, but waiting for a safe turn to get all-in isn't bad either. Then I would have pushed the turn first, to eliminate the free card, although if you expect him to push, the check-call works too.