OK, updtae, disconnected the MAF sensor and that made no difference, so then took the EGR valve out, found a penny blocking the hose so someone had already tried this, and that made no difference, other than ticking over at about 1000rpm instead of 800rpm, so it didn't stall in gear any more...