Now retire the Orbiters to the proper museums and build new spaceships. Proper new spaceships, mind you: ones that go up on a pillar of flame and touch down on a pillar of flame, just like God and Bob Heinlein intended in the first place. I love the Shuttles, but they're old - and while I respect the willingness of our astronaut corps to accept risks, this is one risk that they shouldn't have to accept.
And I also think that it's well past time that we reassessed the current civilian/military division of the American space program. Navy for preference - full disclosure; the fiancee might end up benefiting from that - but the Air Force will be fine, too. Hell, bring in the Coast Guard... huh. That's actually not a bad notion. Go figure.