A lot of times it is the A time being too long or too short. Are you on a 3 hour EASY? You can post your schedule to see if the ladies can help figure it out. From the sound of your message, it seems like it used to be better but changed. Has anything else changed?-part of the schedule, sleep routine, etc.
Also, my dd used to refuse swaddle too. Some people have tried (and had success with) the aussie swaddle. My DD still did not like that. We lay her on top of an open swaddle blanket (use Walmart brand of SwaddleMe) and 10 minutes into the wait time, I wrap her up without waking her. She likes this fine (because she doesn't know about it I imagine). We have found that swaddling her has really helped. Her arms fly around and rub her face and wake her up in her sleep (and on her way to sleep).
But, with the lying awake in crib, I would think it has more to do with A time or sleep routine or it's consistency. Do you have a wind down?
In the mean time, hang in there-it is sure to get better.
Laura