D.B.
You know the answer - let this child self-soothe. She needs to go to bed at the same time every night, regardless of her naps. You will just change up her schedule all over the place, and that will cause more waking in the middle of the night.
She's 6 months old. Why do you feel like you have to give her a bottle? She doesn't need it. She knows you will feed her so she is waiting for you to come in.
You have a lovely little personality there - so many babies scream to get what they want. Take advantage of her being so laid back and let her sleep train and soon you will all sleep through the night. (Well, I hope you will - you sound like you wake at the drop of a hat and don't need a lot of sleep!)
Dawn