We just got back from Disney last week. Lines weren't bad at all. It was still a little warm but not unbearable. I think either time will be fine.
There are two things I don't get... one is anyone who carries a two year old to Disney and the other is the one's who go there in the middle of the summer. I would never do either!