5mo waking 430am + 6 crap naps a day

Help! I’m a FTM to a 5 month old with 3 problems I need advice on.

We’ve just escaped the 4 month sleep progression. Nights fell apart but then got back together again such that LO only wakes 0-1 times most nights, with a bad night say once a week. We haven’t sleep trained yet but LO is out down in cot drowsy and goes to sleep within about 15mins of self soothing. Naps are different - have tried down drowsy but it hasn’t worked so I usually feed to sleep holding LO then transferring to cot about 10min into sleep. Or nap just remains a contact nap for late morning window when I’m trying to extend the nap

Problem 1 is since the progression, which coincided with daylight savings ending in Australia, she went from a 7am wake you could set your watch to, to a 4.30 - 6am wake with 430 more often than not. She is wide awake for the day so I take her out to dimly lit living room and feed her and keep energy very low until first nap around 630am

Problem 2 is her crap naps. They’ve never been great, always 30-40min even when contact (which most are). After the progression a long 1.5-2hr (if contact assisted) nap emerged late morning. However as of two weeks now, that’s regressed back to 30 min.

Problem 3 is with 1 and 2 combined we’re ending up with 5-6 naps a day as her WWs are typically 2/1.7/2/2/2.5 (that shorter 1.7 is actual WW trend data from huckleberry, I always aim for 2hrs but fall short as she cracks it)

What am I doing wrong here??