The choice depends on what you value more, ports, connectivity & long battery life vs pretty display and questionable battery life.
I'd go for the maxed out i7 Air on the refurb store to save money, but if you have little backward compatibility baggage, then go for the Pro and buy your new peripherals with USB-C only.
Go into a store and compare the keyboard and trackpad on the Air and MBP - also see what *you* think about the display on the Air.
Lots of people don't like the new keyboard - I'm a bit more open-minded about that, but I worry that the trackpad is a victim of "bigger must be better" reasoning. However, these things are subjective and you're the one that's going to be using it.
No point in a slightly higher GeekBench score if the keyboard makes you want to chew your own fingers off...
Also, work out what peripherals you need to plug into and think about how the MBP's two USB-C/TB3 ports (and no separate charging socket) are going to work out for you and tot up what your docks'n'dongles bill is going to be.
The other possibility is the 2015 Retina MacBook Pro 13" which isn't that much bigger and heavier than the Air (it's actually got a smaller 'footprint'), has a far better display and more powerful processor than the Air, with far better connectivity than the 2016 non-TB (unless you want to connect high-end 40Gbps TB3 or 10Gbps USB3.1Gen2 peripherals or fancy that 5k TB3 display).
I've tried out the trackpad issue while testing the Fondlebar Pro, all you need to do is turn off tap to click (one touch click) in the trackpad system preference to make sure the trackpad doesn't click while typing.
The question is how long before the 2017 Fondlebar Pro arrives in shops after the WWDC announcement ?