Yeah, ATLauncher is about the best thing around, since it lets you roll back to a working state.

But really this could work so much better if Mojang implemented it.