Sounds like you need to get her to fall asleep by herself so that she is able to fall back asleep when she wakes in the night. Of course she will probably still need a feeding or 2. If it has been more than 4-5 hrs, I would feed her. Since you bf, try posting in the bf forum regarding feeding babies this young.
To help independent sleep in babies, what I would do is have a naptime and a bedtime routine. They can be the same except for the bath at bedtime. Currently your routine is bath, bottle, rock, swaddle and rock to sleep. Why don't you do: bath, bottle, swaddle and rock (but not to sleep). You may want to lay her down awake right away or rock till she is drowsy. Then with each passing day, decrease the length of rocking till you can put her down awake. You can still keep the rocking as part of your routine but just make sure that she is not falling asleep on you.
If she wakes at night, you can try the pat/shhh, paci, firm hand to get her back to sleep. If she fusses, wait and see if she will go back to sleep before rushing in. If you do have to go in, don't turn on the light (even for a feeding) and keep everything very low key. It will be hard but if you are consistent and patient it will pay off in the end.
HTH