The bleed back probelm can be solved using a check valve in the fuel line back by the pump. I installed one from BMW. Gotta be the one of the cheapest BMW parts for what you get. It is a short check valve with about a foot of high pressure fuel line (metric and BMW sells the stuff for 10 bucks a meter), a couple hose clamps (crimp style) and some caps for the 10mm nuts on the car. I have no idea what to use those for even on my BMWs which do not have this part.
The check valve is for the same problem, failed check valve in the main fuel pump. The part is about 5 bucks and the dealer will usually have to order it, but have in in a couple days. Just call the parts guy and order it by number.
16 14 9 068 988
My parts CD does not list the part so I can't tell you the correct name for the part.