I did the same thing on a Raleigh Olympian a few years back.
I did switch to upright bars and cheap VO City brake levers. I'm using the pads that came with the brakes. The rims are CR18's, and I set the front brake tighter than the rear.
I feel confident in the braking; if I wanted any improvement, I would sitch the pads to Kool Stop.