Hey there lovely,
Been a while since I've heard how you are going...sorry things are a bit tricky, but it sounds like you are doing great

If you want to drop the cat nap, could you make bed time a little earlier. Most of the advice I have read suggests most babies don't wake earlier just because they go down earlier???...
I think sometimes babies just wake up grumpy, not alway an OT sign. Our LO often only sleeps for an hour, it's not ideal and I know that if he has had 1.15 hours he has woken because he has had enough...but it's better than nothing (and MUCH better than less than an hour which always happens if our LO has a poo coming).
Hey things will get heaps easier when your LO starts moving around himself, imagine how frustrating it must be to see all these lovely things that they want to get into, but can't unless you take them there....when our LO started motoring it became apparent all the things he had wanted but couldn't get to

It's pretty cute actually!!!
Great to see your post, you are going brilliantly, well done!!
Lizzie