Hey guys first post here.
I bought a 05' XT660X with 18000ks on it about 3 weeks ago was pretty happy with it have ridden it every day with no issues but today it had the weirdest surges during a longer then usual ride at speed, so i pulled over gave it a break had a look at it, checked the fuel all the usual stuff seemed all good so tested it and the surges seemed to be gone so i hit the road again and not 10 minutes down the road without warning it just cut out.
After going right over the bike and trying to start it came to the decision the fuel pump wasnt working so pulled the tank off and pump out only to find what seems to be rusty fuel and a lot of crap in the mesh filter.
Tried the pump on its own out of the tank and found a wire to be faulty (would only switch on while on certain angles) rigged it all up and put it all back together and got it to start again but didnt seem to be able to hold pressure in the fuel lines and would only run for 5 seconds.
Im presuming now i should be replacing the pump but cant find any on the internet to suit an 05' model only this one.
http://www.ebay.com.au/itm/like/1111...=true&lpid=107
Would Yamaha still sell them? or would that pump still suit even tho it says 08' to 12'?
How do i clean out the rust of the tank i can get my hand in quite easily and seems as though the rust is mainly at the top of the tank, all the stuff i can find seems to be for old tanks not much is out there for something this new.

Any help would be greatly appreciated
Cheers Matt.