Right, I've made a decision for the long term goal of this project and it is somewhat predictably getting it campag'd up.
I am also going to go with aero levers - I don't like the look as much (I'm a bit odd like that) but I think they will be more comfortable and more effective.
Part of the long term project will also be having the frame shot blasted and powder coated.
Budget remains deliberately tight, I much prefer a project which is a bit of a challenge.