I replaced my fuelpump with a oem pump and I am not a great mechanic,It was easy.If you read some old posts,you will see that some of us had problems with our 08 wrr fuelpumps. when my pump acted similar to how yours did, I replaced it so I didn't get stranded in the middle of no where. someone posted a few years ago that there was a factory recall in Japan but not in the US,,,,the dealership looked at me like I was crazy when I asked them about a recall on the pump.. also,,one time I removed the gas tank to replace the sparkplug and when I put the tank back where it gos,,I pinched the fuel hose that gos from the bottom of the tank to the injector.....the bike ran like shit until I removed the tank and repositioned the hose and the bike ran good after that....hope some of this helps