Your mysterious fuel trims might have an explanation. The pump my have been dropping pressure while hot and running. Let us know how you like the Hella pump. Mine is due for one too. 170k miles is really pushing it.

__________________
'06 X5 3.0i - bought @143,123 miles (12/26/20)