The surging idle tells me that the first thing to check
for is a leaking cold start valve. Fairly common - could just need a cleaning.