I've always felt that Toastmasters and improv were good ways forward, depending on individual preference (formal/businessy vs comedic). The popular conception is that the former is all about public speaking and the latter comedy but most people I know who have gotten into either went to improve their general socializing/banter skill (I haven't participated in either, just relaying anecdata)