I'm hedging my bet toward fuel pressure. Your pump is about the right age/mileage, they symptoms feel right. The bouncing rpm on the highway make me think of ignition related TCC oscilation. When was the last tune up?