I don't know if this will fix it, but try "re-learning" the idle.
Start car let idle for 2 minutes with each of the following conditions:
1) In park will all accessories off
2) In drive (handbrake on) all accessories off
3) In park with lights and aircon on
4) In drive with lights and aircon on.
Might help, this is the normal cure for a bad idle after the battery has been disconnected.