The "keep the peace" part refers to whether or not Yuuichi confronts Shoichi's Dad upon meeting before the argument. Yuuichi doesn't like how Shoichi is treated, avd Shoichi knows, regardless of what option you pick.
Aki asks if you're dating if you don't confess the truth to Saya. But the reality is that he pretty much figures everything out very early into your relationship either way.