Hello,
Bored with the fuel line interfering when adding oil, and having to renew my straight petcock, I bought a new angled one.
It fits because it is made for the same BMW tank. It clears the fuel line routing. IT is not 100% original so will prevent you winning the show, but....
I did not measure the two straws coming out of it but I still have a decent reserve when I turn to Res. position....
So it is perfect for me.