1st hand i think you should've potted the flop and pushed the turn. You are most likely ahead and drawing to the nuts, so you should get as much money in as possible. As played, just go all-in on turn.

2nd hand - just fold. i think you are right about either going all-in or folding, and there aren't too many hands you're ahead of. From my experience, he probably has aces, even though i think he played them horribly.