Your situation is a little different but the only overall I can give you is to not try to fight it (aka not try to be fluent) because that leads to the development of behaviors that make everything worse. Let yourself stutter if one comes up, it will make things better in both the long and short run