maybe your HPFP is going bad.
I went from a e92 328i which was very reliable to a 335i, although definitely fun to drive gave me numerous headaches. Now I drive a e92 m3, and I love it.
I suggest you save up and just go for an e92 m3
AND OP you will probably get more answers if you go to e90post