hi i have a mk4 golf gti 1.8t with a problem that is driving me mad

.
when started in the morning from cold the car runs perfectly as it should, il stop and switch off for a few mins (i.e. popping to the shop), il jump back in and start her up again and the revs rise to 2000rpm for a few seconds then idles at 1200rpm.
there is also a slight hesitation on the throttle when parked.
i had it plugged into a vagcom and it showed that the temp sender was faulty so i changed it and for about 4 days it seemed like it had cured the problem untill friday last week when the problem came bk

.
if anyone could help me it would be much appreciated thanks
