gauvins I actually had a third option that is pretty similar to what you suggested, but I let it out of my original post for simplicity.
Here it is.
Option 3
Total Estimate ($315)
Velo Orange Curvy Bar ($55)
Ergon GP1 Grips ($40)
Bar ends ($25)
New Brake Levers ($25)
V Brakes/Mini V Brakes ($40)
New 3 x 9 trigger shifters ($60)
New stem (31.8mm clamp size) $(40)
Handlebar tape ($30)