I have a similar political mindset, but I'm afraid to apply the label "libertarian" to myself because it conjures images of Rand-following Objectivists who believe tax is theft and externalities don't exist. I wish there were another name for that quadrant of the political compass that had less connotations.
My libertarian cube mate calls me a progressive libertarian. Which I believe describes me literally, although the term has all the feel of that other marketing term, "compassionate conservatism." Still, I think it's pretty close, as a literal term.