Have you considered changing her formula? My daughter became extremely aggitated when she was 2 1/2 weeks old. She would just cry and cry at night and make lots of grunting noises. I switched her from a milk based formula to a soy and she was like a different child. We did it very gradually so as not to disrupt her system all at once.
I would try a formula change. It at least couldn't hurt. It can take about 4-5 days to see an improvement as well. Also, like the previous poster said, baby gripe water is wonderful! It really helped my daughter with gas. We also bicycled her legs to help her during the formula change.
My heart goes out to you! I know it's tough.
Good luck!