I usually do this kind of thing by making a new branch and interactive rebasing. Generally works well for me too!