The answer is, there never will be peace in current configuration for conflict of interest is irreconcilable. Regardless of rhetoric, various teams joining F1 series for their own reasons. F1 became a branding series, and lets face it, struggling teams like Williams are not exactly good ROI for Liberty at the moment, as BB are involved.
Liberty has an option to let automakers go and try to turn clock back a few decades (crazy idea IMHO), or reconfigure series with 5 teams racing in tier 1, and allowing for B-teams in tier 2. (That might work.)
My recommendation however would focus on definition of a composite profile of potential customers who will carry them in next decade, and tune up series into a body which will cater to this new generation of fans of the sport. Product on the track, and MO of viewing delivery has to go hand in hand, regardless if same older fans (myself included) will fall off. Program might not be implemented in full by 2021, but should transition into new world asap. End of CVC's CA should follow with surgical like cut with the past. It will be painful, shocking, yet necessary if this series is to survive. Last point - make it less British, and spread it globally. Ferrari is a good example it could be done.