I don't know how helpful this post will be so longer after you first asked for help. My suggestion would be to look up the repertoire requirements for the schools your going to apply for, and find repertoire that fits those perameters. For instance, most will ask for something from Bach WTC, but as for the classical, they're going to want a Mozart sonata, not a Fantasia (in my experience). Don't overload yourself with things to learn, also. The faculties aren't judging your repertoire, they're judging your performance of the repertoire. This is something I had to remind myself of last year when I was auditioning. Everytime I filled out my applications with my audition repertoire, I thought, "Well, that will impress them." In reality, the titles are just words. Pour your heart and soul into practicing your audition program.
Although the second version was more varied, I would look into some slight alterations. You don't want to overdo yourself.
Mike