I'd take another look at the ICV, even though you cleaned it 20k miles ago. Easy to check and to clean. I think it would provide the symptoms you're seeing. And it could be that your cleaning did not get all the gunk.

__________________
2001 X5 3.0i, 203k miles, AT, owned since 2014