The Suzuki one certainly looks like it.
Use a mirror to check the pin on the tank socket, if the plug is bunt it may be also.
As the wires insulation is breaking, it may be better to pull some new wires through from the tank, to the seat area, by attaching them to the old ones.
Push on you are almost there.
