Warlock -> ???

Hey y'all. So I'm playing a Thermo Fist/Light Warlock atm, and I'm repeatedly noticing that my combat just kinda sucks. NPC's of much lower level than me are still able to pose sizeable threats, and other Players just kind of effortlessly bulldoze me.

I made this build because I thought the fastest magic and style together would make for fun zoomie shenanigans, but the speed isn't really making up for the nasty feeling of having to constantly run from fights.

I've got one Prometheus Acrimony, so I get one shot at switching it up. But I'm stumped as to what I should switch to. Warrior? Warlord? Berserker? Or should I skip the reset and just change to a new Fighting Style?

Bearing in mind that I like to play my combat fast, up-close and intense, what kind of build would you guys recommend?