Hopefully it just gets better. I'm 38 and I'm way more fluent than I was 15 years ago. I also stopped caring as much about what other people think and I think that that helped, but of course it's not like there's a switch you can just turn off. You could also try acting crazy all the time to try and move focus away from your speech. Just spitballing here...