Also, make sure you change the brake fluid, if you haven't already since it has been over two years.

As for the surging, maybe the throttle body needs cleaning. I am not sure where you bought the car, but if it is Honda Certified, take it to the dealer.