𖑬 DL, Manual, 274,000]

I may have two separate problems or they could be the same. I'll try to describe what I've noticed:

1. Car sits over night. Starts up just fine in the morning. Idles perfectly for approximately 20-30 seconds & then tries to die, at which point I start to drive. Car continues to run as if I have a "choke" on the engine. After driving this way for approximately 4-5 minutes, and as my temperature guage is approaching normal operating temp, it feels like the "choked" feeling is turned off & my car surges forward & then runs perfectly the rest of my commute until:

2. I come to a complete stop, car idles fine, but when I accelerate again it bucks & hesitates badly, like it's not getting enough gas or something. Once I get back up to speed again it's fine.

Some things I've tried:
A. Replaced spark plugs & wires
B. Replaced O2 sensory
C. Cleaned Throttle body and installed new air filter
D. Poured a bottle of HEET water remover in gas tank
E. Poured a bottle of Injector Cleaner in gas tank
F. Filled up with premium gas

My car runs a little better now, but the underlying problems have not gone away.

My next idea is bit more expensive: Replace injectors, and MAP sensor?

Any ideas?

Thanks,
Matt