Fear of the unknown

You know I've been trying to repair my motorcycle over the past couple of weeks. I've narrowed the problem down to what I'm pretty sure is the fuel pump being shorted out.The problem arrises when I look at the parts fiche:I went ahead and ordered part #1 -- the entire fuel pump assembly. I didn't want to dick around with fitting a new pump to the thing since that involved hoses and clamps that require more tools to buy. It winds up being maybe $40 more than the pump plus extra parts but it eliminates a lof of the uncertainly.That's not the problem.Part #10 is the the part that worried me. It's the fuel level sensor. It's somehow attached to the pump.

Looking at this I was wondering how this all fits together with the pump and how it comes out, and more importantly, how it goes back together.I was all ready to just go in blind and worried when I found the shop manual for my bike. (I had one for my earlier iteration of the bike -- that one had a float instead of a new-fangled, and as it turns out fault-prone, electric sensor)It seems that the business end of the sensor (#1 below) attaches to the fuel filler (#2) and the only interaction with the pump is the plug you see on the upper-right of the picture up there.The only thing I have to do since I'm not screwing with the sensor strip is unplug #3 from the fuel pump assembly, swap in a new one, then plug the existing fuel sensor back in.Easy-peasy.All I have to do is wait for the wrench (#1 above) to come in from the US warehouse. Booo... I ordered it on Thursday night and it'll take 2-7 days (business days I'm presuming) to come in and then get shipped to me.C'est la vie.But knowing what I'm up against -- or as the case me be not up against -- is a nice thing. Now I'm just hoping my diagnosis is correct!