Both are fine because they work differently and need to be with different things but I believe some need to be changed time wise. If you lose to a boss you shouldn't need to wait 12 days a couple days is better especially if you do the same time for a win. It's ridiculous to lose and wait almost 2 weeks to battle again and that's really the only thing I would change. Just reduce boss cool down time after a loss.