6.5 month sleep schedule help!

My daughter just turned 6.5 months and was wondering if I should transition her from 3 naps to 2 naps. She is extending her wake windows to about 2.75 to 3 hours but still only takes 30 min naps. Her 3rd nap is then falling after 5:30 pm which means her bedtime is 9 pm. I tried to go to 2 naps and helped her with each nap to extend it which sometimes was successful and she would nap about 1.5 hours max. The problem is when I did 2 naps, she would treat bedtime as a nap and wake up 30 mins after bedtime. This happened for about a week so I assumed she was not ready for the 3rd nap to drop and yesterday did 3 naps again even though it was a late bedtime and instead of waking up within 30 mins she woke up about 1.5 hours, granted it was only 2.5 hours between last nap and bedtime. I usually do 3 hours but it would be way to late. Not sure what to do and if it's best to keep 3 naps or transition to 2. She usually also wakes up between 7:30 and 8 am. Should I be waking her up earlier?