Your plan sounds good. I was playing 25NL just Feb of this year after basically destroying my own BR but am now rolled for 3/6. You will move up fast as shit. Don't be afraid to take shots at 20 buyins though up to 400NL. I attacked 200NL at $4k and 400NL at $8k. The first few shots I took at 200 and 400 were disastrous but eventually you will run good and get yourself 30+ buyins. Good luck, and its good to see you moving up again.

Oh, one thing that helps is goal-setting. Set yourself a reasonable bb/100 at each level (take into consideration how many tables youre playing) and then set time frames for moving up to each level. Even if you give yourself a lower bb/100 than you realistically expect, you'll be pleasantly surprised by how fast you can move up.