To rock or not to rock....that is the question?

OK so here's the deal. Since Marie is starting to get her teeth I REALLY want her to stop taking the bottle to go to sleep. This idea comes from my personal history of having lots-o-cavities when I was a child. Mom and dad tell me the dentist said it was because I would fall asleep with a bottle. I don't know how often my parents would brush my teeth at Marie's age but in the McDaniel household we try to brush at least twice a day (if I don't COMPLETELY forget, it happens). Last night she had a little bit to drink before I laid her in the crib but she wasn't aleep. She cried for about 7 minutes (I watched the clock like a hawk, I vow to not let her cry past 15 minutes...softy I know). Tonight I was sooo proud because she ate really well for dinner. She had about 6 ounces of formula after her meal. All seemed fine. In her room where it's dark, cool and fairly quiet I am rocking her, patting her back, softly humming a bedtime song. All the time she's rubbing her eyes, yawning and bouncing her head off my shoulder (I say bouncing because she will look up at you then slam her head in to your shoulder, then look up and then SLAM...repeat). I'm thinking ok NOW is the perfect time to lay her in the crib. So I kiss her. Put her down. Crying is already starting. I walk out of the room, close the door and look at the clock...7:51. Ok 7 minute countdown. 7:52 still come crying I hear the sounds of a little gag (normal for Marie when she's crying). 7:53 Crying, Gag, GAAAG, then I hear the sound of vomit hitting the floor. And repeat. DANGIT! So I go in to rescue my child. Turn on the lights. Not only is she convered in vomit but so is her bed and the floor. DANGIT! So what should I do differently? OR should I just forget about the whole idea and just remember to always brush her teeth twice a day? I really want her to have a healthy attitude about sleep but I don't want her to vomit every time I let her "cry-it-out." I don't think that would develop a good association with sleep. To be honest I guess I could have let her play a little longer after drinking the last bit of her bottle and be assured there are NO air bubbles in her tummy. But dangit when she cries hard she REALLY gets to gagging. So please contemplate and discuss. I've got vomit to clean up...