kommen should come beforewir in the second half of the sentence. This is because there is still a question being posed <em>(are we coming to you?)</em>, so the verb comes before the noun.
It should look like this:
<em>Kommt ihr</em> zu uns, oder <em>kommen wir</em> zu euch?
