She's still having a lot of BFs through the day, I'd do away with the DF - she likely doesn't need it
How much is she eating for dinner? I can imagine she may still be full if she's eating a lot at dinner (remember her stomach is the size of her fist) as solids take longer to digest than breastmilk. Given she's not waking hungry in the night, she's clearly getting sufficient calories in the day and she's still having plenty of Bfs in the day, just going a long time in the PM/night without intake which is probably ok at this age.
I think in your shoes, I'd try solids for breakfast and lunch and do a BT BF, so substitute the 12:30 BF with lunch and BF at 4ish with a top up at BT. At this age, we had two 1hr naps but nice to keep a long nap if you can!