I'll talk about topwaters. You're already set with buzzbaits. I'd add something weedless, like a hollow frog, for working slowly in vegetation. Also a soft plastic for buzzing in weedy areas, such as Sizmic, Horny Toad, Ribbit or something in that category.
For hard baits, poppers are good for keeping a bait in an area for a while by jerking and pausing. There are walkers for covering water, such as Zara Spook and similar baits. I use Jitterbugs almost exclusively when fishing hard baits on the surface, but I'm not necessarily recommending that you do that, I'm just mentioning my own blind loyalty and confidence in that lure.
Good luck.