You kind of deserved it though. Put a raise in somewhere, someone with the will call, as will two-apirs and better, or even a single pair + club.
On the river, mjeh. He either has the or playing like that, so I think that push is pretty pointless. Since if it is 50/50 which he has your push is EV neutral and increases variance.