Have you tried talking to the cafhs nurse? I know mine was fantastic and helped me settle dd back when she was 2 mo. Now I feel armed with ideas for settling her? Might be worth a shot, and they're free unlike the doctor

I still wrap dd and that keeps her settled, she just gets her arms out once she is asleep. I also find infants friend works wonders when she is unsettled at night. Have you tried that?