winter project started a little early....

Well, it appears that I am starting my winter modifications project mid summer. Racing a gixxer the other day (which I smoked) I ended up spinning a bearing or something. The motor has a very loud knock under load and noticable loss in power. But my viffer still got me home! Anywho, couple of questions to anyone who reads. I am looking at a used motor off of ebay so I can eliminate down time before the summer ends. Will a newer fuel injected motor fit in my '92 frame. If so I would just need to swap over any wiring and modules to make the fuel injection work I would think. Does anyone have any experience with this conversion? Secondly, with all the fairings off the urge to turn her into a street fighter is growing every time I look at it. Does anyone have any experience with mounting an aftermarket single headlamp? Where are they available from? Also, I can live without all the gauges but I still really want a speedo and tach. However, I'm not really interested in one of those big bulky combo box units that I have seen other using. Does anyone know of a mechanical aftermarket tach that would adapt? Would I have to convert to a eletronic one? Along with that the speedo would need to be replaced. Again does anyone have any experience? A lot of questions and I probably still have more....Thanks for any help in advance. Wish me luck....