Personally, neither is my most-anticipated series from KyoAni.
Regulars will know which series' announcement will make me scream like a 15yr-old fangirl and run around yelling and whooping incoherently.
Also, there is still the possibility of Planetarian, which might just make people like Skyfall rip off his clothes and streak on the streets.
In short, I am fine with either CLANNAD(TV) or SHnY 2 airing first.
Cheers.