The 30 minute naps are still classic OT. Have you tried scaling back her A times?? If so, what is she able to do?
Because she's so young, you can do a bit of APOP to help her catch up on sleep for a day or so. Then, you just have to work on making sure her A time is the right amount for her, her wind down is good, and that she's not OS.
Glad to hear about your epiphany re: her wind down preference! All babies are different, so if it works for her, then that's great!