If she is eating solids, three meals a day, snacks and eating more table type foods, whole milk straight is great for her. She should be getting the bulk of her nutrition from solids now.
She needs the added fat for her growing brain hence the whole milk now. If she isn't eating solids well or meals regularly you can keep her on formula and alternate with whole milk. I don't think I would mix the two, hee hee. And yes formula smells awful. You can also try carnation instant breakfast with her milk too if you are worried about the added nutrition.
She needs the fat of whole right now and have your Pediatrician gauge at her checkups over the next year and tell you if the percentage in milk needs changed.
If she is one, take the bottle out of the picture and save your sanity!! She doesn't need a bottle anymore, it is bad for their teeth and can become a dependency not a need. Go get fun sippy cups and strawed cups, the sooner you do this the easier it will be. For both of my kids I just took the bottles away on their first birthdays and they never even missed them.