WA proposes new cannabis regulator, organic MJ program