According to the show runner, the return of Michael Swift was to set up the third season.

Actually, that is wrong.  In an interview with Entertainment Weekly, the show runner said that the actor Tom kissed is gay, but in the closet.  It was written that way to set up the third season when Tom and he would be dating while working on a movie musical.  You should research your trivia.