Good deal on the fuel pump there. I'll keep that in mind.
I'd replace the s-bend pipe with something meant for fuel, since it's such a "I never what to do this job again" part. I'd assume you could bend any steel line, as long as the fittings match. There are many different types of threaded fittings, I'm not sure which one BMW used on those tank bungs.