Sounds like it's well in hand. I always went straight to Ed's Red, and put a cleaning rod w/bronze brush in a drill chuck, followed by patches or a bore mop. The trick (which I confess to not being religious about) is to not let it get that bad in the first place!