i have done this several time. 

yes file two returns.  one for S-corp from beginning of year to when the revocation occured and one for C-corp from start of C-corp to end of tax year.

remember corp return is due 75 days after period end...so watch out for your s-corp deadline.