Welcome, that's a sharp looking bike w/ lots of nice details and a decent paint job it looks like. Even the floor rail install looks well done. Only that thick bondo shot is discouraging

, hope you don't find any more like that. Only other thing I'd do is replace that cheap chrome legshield trim w/ the original aluminum style. Not much money but a time consuming PIA to do.
Bikesbybaker wrote:
Is it worth upgrading the ignition system or replace parts as need?
I have ordered in a new 20/20 carb.
I'm thinking I need a new switch on the handlebars.
Assuming it runs... everything Greasy said.
Your Bajaj ignition should be fine for now if it works, maybe new CDI as mentioned for insurance. Get thru all the other stuff on your list then consider a better modern 12V upgrade, especially for the nice bright lights.
I hope you ordered the
oil injection 20/20 carb, the usual most common one won't work w/ your autolube - no 2T oil to your motor!
Is your switch broken or just stiff & sticky? The broken yellow wire can be easily fixed. There will be a half inch or so of tinned lead inside the terminal it broke off of. loosen the little screw(DON'T lose it!) and shake or poke it out. Now strip the yellow wire back a half inch and tin it nicely w/ solder. Put it back in its terminal and tighten the screw. Some contact cleaner and a little lite oil, now see if your switch works?