Thanks guys.
I went with a rust neutralizer/sealer kit as to stop any rust i may miss in the tank waiting a few more days for it to dry.

I got a quote from yamaha for a new pump and it nearly made me choke on my tounge when they told me.. $770 ! There was no way i was paying that for a 9 year old bike!

So i found one from china for $160 Shipped to aus which was quite reasonable but they had none in stock :| .. so i eventually went with a pump similar to the one i linked in the first post that i actually found at a local auto store while messing round out the back and works a treat!

But a problem still seems to be present. It will start but wont idle or run. Im taking the strainer, the fuel rail and line to work to clean and ill get the injector cleaned and flow tested.

But it seems like a vacuum leak nearly anyone had a similar problem to this?
Thanks Matt.