hello!
well lets start with this, ok so you said that you got old habits but you never say BAD habits, at first you need to evaluate your guitar playing, are those playing old habits in the rigth hand preventing from what you really want to play?

if your answer was yes then you have to unlearn, you must forget that you know something about your rigth hand, then start to build from start, thats the only way to get to another level, because if you stay with your old habits and then new ones yow will be just a combination of that.

i use to study guliani 120 arpeggios.
and rigth hand development for the jazz guitarist.
and gustavo assis brasil hybrid picking.

you have material for all your existence in that books just for the rigth hand.