One possible suggestion for quick fix:
- TB only subtracts from nonlethal damage
- Unnatural TB subtracts from all damage
- Reduce ordinary damage dice to D6
After that it gets a bit more complicated as you have to wrap your head around every permutation where the change might have an effect...
Relatedly; the ciritcal system also sucks, so changing just this one bit doesn't really help much IMO.