Almost one month already! You're doing great!
I had to drop tea, coffee and dark chocolate with my DD. It made a difference but she was still miserable for the first 7.5 weeks. I tried eliminating all sorts of other things to no avail. She was one of those annoying "only time will help" babies!