Actually, today she was an angel and back to her old self, although a wee bit cranky in late afternoon. DH and I decided to tone the whole day down and just make her laugh lots especially in the afternoon. After her late PM catnap, I gave her a bath and kept it real quiet, ie singing softly, whispering and keeping her laughing and smiling as much as I can. I noticed that she didn't flail as much as she normally does especially during that time... By the time it came to feeding, she was nicely relaxed, took a nice 6oz bottle and went to sleep nice and easy.
So have decided to continue on this path if it makes her happy!