Cath, it sounds like there is good progress already
If you had a better night then it's already good news as far as I'm concerned.
It's more about aiming, yk? Aiming that the A time is a certain time, aiming that there is an order to the routine, but it's a difficult task to do that at such young age, so consider everything you do achieve as a great thing and if things are a bit wonky, like having a bit too long A time just write it off. It will not effect what kind of a sleeper he is going to be when he is a bit older and right now it's more going through the day in the best way you can.
I used A LOT of AP when DS was a baby, but I was conscious when I made this decision and picking the method that worked for us. There was no way I would have rocked, or sat on a chair with him or let him fall asleep on me because I knew I won't be able to maintain those things. So for us it was feeding to sleep and naps in the pram, which I knew I don't mind to do for a very long time, till he is old enough to be ST.
If you know that rocking will be difficult for you then don't even start.
Wind and colic were big issues for us as well. I had to make sure I am burping him properly, even if it took a while, because if I didn't I got no sleep out of him, poor guy. I also used caraway seeds oil to put on his tummy, massaging it in circles, lots of bicycle movements and I was BF then so I drank gallons of Fennel+caraway tea.
