I would do the suggested troubleshooting of the MAF first as a 'sick' or bad MAF can cause all of your symptoms.

Also easy to clean with MAF spray if is only 'sick.'

__________________
X5 4.6 2002 Black Sap, Black interior. 2013 X5M Melbourne Red, Bamboo interior
Dallas