#1 is also correct, since まてる is the potential form of まつ and が indicates the object of some kind of verbs or adjectives(potential forms, -tai forms, state verbs or adjectives which express emotion/sense).
Of course ともだち can be the subject of まてますか, as already explained, depending on the context. (Therefore I, too, recommend to use #2 to avoid ambiguity.)