I think the most flexible way of incorporating your changes would be to have the SObject list alphabetized by the generator and put the Chatter objects in a separate block that can be easily commented-out.
Do you want to put together another pull request with that implementation?
Matthew