I mostly like both. I don't kow if I would have called the flop in 2)
Would you have semi-bluff-pushed if a 9 or club hits on the turn?