Thanks Lulunut!! I appreciate the advice and support.
Because she gets that morning bottle and then breakfast, she is not ready for lunch before the nap. I've tried and she's refused to eat much so what I've been doing is giving her a snack before her nap, something to fill her up a little, like a yogurt. As for the bottle upon wakeup, I know she won't take the bottle, then dinner and then another bottle - we're on 2 bottles a day and I'm lucky if she takes those. So there is no more afternoon bottle 99% of the time, I've been opting for an earlier dinner.
However, one thing I want to mention is that I have had some NWs lately. She IS teething (teeth are popping out left and right, I feel so bad for her!) but i've also been offering her bottle to get her to go back to sleep, plus pain reliever. Some nights she takes a few oz, some nights a full bottle, and some nights she STTN. Its confusing. Is this all part of the 2-1 or is it teething? I broke a NW/feeding habit not too long ago so I'm not happy this is happening again but if its teething I truly feel bad for her.