Hi, congrats on your new DD!
Or should is AP the only option til she's settled in the big world?
I think there's a lot to this. I really don't beleive it's AP/prop at this age. She's so young, she's going to need some extra help to settle... she really is still adjusting to being on the outside.
I remember wanting to 'start as I meant to go on' with DS and was trying to shh/pat, etc with not much success while he was so young. He really didn't take to shh/pat until he was about 6/8/10 weeks. Until then, I would just hold him still, swaddled, and with white noise until I felt him relax and settle a bit in my arms (sometimes all the way to sleep). This didn't lead to any prop issues and when he did start responding to shh/pat, he started settling much quicker and without my help a lot of the time. I did do at least one fully APd nap a day for a good while with him as well (probably til 6mo or so), just to retain some sanity and be able to meet DDs needs as well. When he was little, this was in the wrap or carrier, as he got older it was in the swing. I needed that one time of predictability each day and I actually think it made him more of a flexible sleeper (he sleeps well in lots of situations and could be easily APd when needed without too much of an issue; definitely not the case with my DD, who I was quite strict with AP... of course, they also have totally different personalities
).
As for the feeding goes, I've always followed the 3hr max philosophy until my supply is established, but I know it's not the only way. I definitely wouldn't battle her to go 2.5hr if she's not wanting it... my DD was super sleepy and no way could I make her eat before those 3hr were up (even that was a struggle sometimes). I do wonder if you did a cluster in the evening, but tried not to feed every hour, that might help with some of the unsettledness and wind. But, that's also such a normal time for them to be unsettled, sometimes you just ride it out and do what you can.
(((Hugs))), those first few weeks of going back to the newborn stage can be overwhelming. It sounds like you're definitely on the right track!