I'm having the same stalling problem now on my 97 C220 diesel. I can see air bubbles being drawn into my fuel pump.
Was your problem corrected? Was it a bad fuel tank? Is there a correction procedure for the faulty fuel tank.