Well I stopped by a guy who had some parts for sale. Got a new handlebar, polished aluminum. Looks like the black slightly curved flat bar that I have on the bike now. Got some standard leverage brake levers. Also got a 7speed Shimano cassette. First thing I did tonight when I got home was take the 7speed shimano cassette and just pushed it up against the 7speed freewheel. They both have the same spacing. So I went and did the conversion.
Replaced the handlebar, put the shifters on, new brake levers. Got everything adjusted and it works great on the bench. Shifts though all 7 rear gears properly and shifts the 2 front chainrings properly as well. Can't wait to go for a ride tomorrrow.