I have a plastic tank, EURO model. As far as I know cars exported to USA had metal tanks. The fuel pumps for them are different.
My fuel pump also died last year. Found some on Ebay.de, can't remember with what terms I did the search. Eventually bought a used one from another BMW locally.