If I would work on my speech it would not be to become fluent, but to express myself more. I think putting fluency as the goal is not helpful. But everyone has their own journey :)