Sounds like you're doin' good already!

I don't rebuild Yamaha fuel pumps, I replace them. The kit cost me somewhere around $25, the whole pump is around $42. Not worth the time to fiddle with those thin gaskets. I do put a socket/screwdriver on the fuel pumps at every service, they tend to loosen