Refining Competitive Electricity Market Rules To Unlock Flexibility