Hi pipkin and welcome to BW!
It does sound like the 3-2 nap transition, however, we can try shifting her routine to see if it'll help with her night wakes. Usually that is a sign they need more activity time during the day, and/or a reduction in day sleep.
Just want to clarify... she is waking at 6am? and taking the first nap at 8:30? If so, pushing this out to 8:45 might help push the day back so that her second nap falls later in the day and have 2 naps. during this transition, you'll probably toggle between a short and long pm nap and that dictates whether or not you do an early bedtime or a short (15-20) CN before bedtime.
She might be undertired for her second nap, so a change to 12:45/1:00 could help make that nap longer.
Basically either of these two routines:
WU 6
Nap 1 8:45/9:00 (1.5 hrs)
Nap 2 12:45/1:00 (1.5 hrs)
BT 6:30
WU 6
Nap 1 8:45/9:00 (1.5 hrs)
Nap 2 12:45/1:00 (45mins)
CN 4:30 (20 min)
BT 7:00
Give or take some time depending on her wake up times.
Here is an article regarding the 3-2 and some options.
https://babywhispererforums.com/index.php?topic=246541.0As for feeding to sleep and rocking... it doesn't seem to be affecting her night sleep badly, but working to reduce this now can help her independent sleep for the latter part of her first year.