Yep, agree 100%.
Once we have 16 teams and can have a 30 game home & away system with just 2 derbies a year it’ll stop those games being diluted as well. I’d also say don’t schedule derby games for the first 4 or 5 rounds, let the tension/momentum build a bit.