I feel that your changes are going in a right way. Smaller numbers, more attention to the fiction, shared responsibilities to the whole table. Nice!
I wish you a better, calmer life for your tomorrow. Return to the RpG design when you are feeling more positive and happy. Avoid the burn-out!