Improve client validation of channel picker

Now supports "must select either an existing channel or a new channel"