Hi there
We have just been through this as well. DD is also 7 months. It started with resisting daytime naps and taking a full hour to hour and a half to settle for bed at night. Then the night wakings started. We also spent her first night away from home and it didn't help either.
I did the same as what the others are saying and dropped the catnap. At first it wasn't easy as DD was only having a 40 minute nap some afternoons and so by bedtime was sooo tired. I compensated by bringing bedtime forward a little, first it was 6.30, then 7pm then back to 7.30. This probably took about a week, maybe a bit less to get back on track. We used just in cot settling during the night, my DD gets so much worse with PU/PD, we found just a hand on her back was enough sometimes, otherwise a bit of patting or rubbing. Also had to make sure it was Dad doing the nighttime settling, I would want to give in and feed :oops: Also he just seemed to get better results.
Anyway it worked. Not only have the night wakings gone but her daytime naps have become two TWO HOUR naps!! After months of 45 minute naps I thought that she was always going to be a power napper but it is really good now.
I'm feeling for you, it is so exhausting. Hope this helps.