Deffo idle control valve my GTi was doing exactly the same thing. Took the valve of cleaned it out, coated it with good old WD40 then reset ecu. Make sure you reset ecu cus mine ran a bag of sh*t till i reset it.