Stalling

I own a 2002 Honda civic with about 158,000 miles. My maintenance required light came on about a week ago, and I was planning to have an oil change this week. Well about 2 days ago it was around 83 degrees, and I was driving on the interstate, stuck in pretty heavy traffic. Upon shifting gears and attempting to accelerate my car jerked, bogged down, and stalled completely. All lights were on and the car would still turn over but not start until about 5-10 minutes of cooling. It then started and I continued to start it, drive a few miles before stalling again until I could get to a safe place. It is a manual and I recently just had a new timing belt and water pump installed. Any recommendations are greatly appreciated. Thanks