Instead of reinventing the wheel, look at a system that actually worked (not perfectly, but at least worked) as it did with Deadfire. With minor modifications, it has the potential to work really well.