Is this about bathroom privacy or religious liberty to discriminate against those who do not share their beliefs?   
Your initiative is a violation of the "single subject" mandate, by your own analysis.