I think this is a special case that you should probably call and ask. My first impression is that you should still include both of them, but I could be definitely wrong here.
P.S. Why don't you apply for FAP next year? If you apply now, get the FAP, and apply, isn't it a little bit too late for this cycle? I was just curious.