Received my new pump in number of days, ordered from UK website and product was shipped directly from Latvia by TNT, so it was fast. Total cost around $150.
I was going to change it right away, but noticed that the epoxy I had used to stop the leak has somehow miraculously cured the leak. When I applied it and tested the following day after applying it, fuel was still leaking. After sitting for about a week, not using the car it was just fine, no leak at all! Very strange, but that is still the situation after several days. Planning to put in the new pump but kind of qurious to see if that epoxy just keep holding for another few days. Obviously, it will give you a termporary fix, just be patient before using your car, at least few days. 24 hours was not enough.
My new pump is Bosch 0 580 313 104, and that level sensor was very easy to remove. Ready to go in and now I have a spare sensor.