Since lots have looked at my post and no one has responded, I feel I might as well update this
In the end, the gas tank of my Z4 had to be replaced. It seems that one sensor is in the tank, and if this sensor doesnt work, you need to replace the fuel tank.
The dealer did this at his cost. I was really happy because the BMW dealership said it would be a four to six hour job.