The issue with Tunnel Fighter is that it is broken. Just remove it and your problems will be gone, no need to fix other things.The issue with Tunnel Fighter is that in combination with polearm master, it allows unlimited attacks on enemies who approach so the real problem is the extra damage from divine smite multiplying across many many attacks.