I'm going to need a cigarette! :-)

for that distance you find swapping drop bars will get you faster again, and still provide some upright positions. I did that with my bike, it's a pain but I'm a drop bar guy, and there's nothing wrong with that :-)