I think I'd let go of the hand on the flop - It was a fishy limp and he could have a wide range of hands ahead of you right now. I like the push preflop, but that's gotten me into trouble plenty of times too.