http://sheldonbrown.com/tooltips/bbadj.html
its everything you need to know.
You might want to get new bearings, they are cheap. If you do, you should use all loose bearings and ditch those retaining rings
you got the right idea though, degrease it all and follow the instructions in that article.
You don't need to remove the other (fixed) Cup.