You are in right direction. I would further narrow down the diagnosis in order of preference.
1) Leaky or clogged fuel injectors. Service them. Sonic service instead of pouring injector cleaner in fuel tank.
2) MAP Sensor needs cleaning. Service it with contact cleaner. Disconnect battery terminals before disconnecting the MAP Sensor for cleaning.
3) TPS Sensor. Service it.
These three steps should be sufficient for rectifying this problem and also for good performance of engine.
I am ignoring the clogged catalyic convertor. That can't be culprit for the specific problem you've mentioned.