[ChrisV]

Raise allin on the flop. As you discovered, if you raise less you are just calling when he pushes anyway, so you might as well push yourself and put on maximum pressure. If called you are usually in fine shape.