It wasn't a disastrous fold, but it wasn't one I'd make. The real problem was the bet on the river, IMO. Did you plan to bet-fold if he did that? Never bet/raise without plan. Considering that what you've said tells us a bit about your style and bubble management, you should be turning this hand into a bluff-catcher. What I mean is, if you know you'll fold if he shoves, then you never should have bet in the first place...there are simply too many hands you could do that with and with those stacks you just set him up for this play. If he sees you as a very tight player, and considering the stacks and bubble, there aren't many hands he couldn't profitably do this with.