Start a new thread in the electrical part of the forum, and you'll get some good ideas of places to look regarding the lights. More then likely a short.
There is a thread in the "Tech Articles" section(see the tabs above)about changing the needle and seat, and going pumpless. You want to use the Yamaha OEM needle and seat set, that has the -30- in the middle of the part number. Don't use the Suzuki parts mentioned. See the 2015 update.
It's one of the first things I did on each of mine. It was pretty well established by the many who frequented the Forum long before I got here. If you have questions, and can't find the answers searching the forum(see the "Search Forum" in the blue banner above), post up your questions, and somebody will help you out. Most bikes over 10 years old should have the needle and seat replaced anyway, simply do to age. They will start leaking around the oring that seals the seat, before they leak in the seat area.