I did almost the same thing for my son, and this is how I transitioned him to cows milk, once he weaned himself from breast at about 1 year old.
For me, I give my son milk whenever he asks. Or before nap or bedtime, and after. BUT, my son is a VERY VERY picky eater... thus, and per our Pediatrician, it's fine for him and he gets his appropriate intake & calories this way.
That being said, a serving for my son is a regular 8 oz. cup. Or when he was younger, an 8 oz. bottle. But my son is 29 months old now... and he gets about 4 cups a day, sometimes more. My friend, was very similar as well, with her son who is the same age. I really personally, don't think it's 'wrong.' Some may agree, some may not. But my son grows like a weed and is very healthy. I really don't 'count' how many cups he has or 'restrict' it though. My friends seems to have been the same way about it.
My daughter at that age, well she was not a big milk drinker...but so I gave her milk on demand or at meals. My son on the other hand, only will drink water at meal time. Each child is different.
Since your baby is only 1 year old... I assume their milk intake 'can' be more, and it is still an important 'building block' for them. Since for the first 2 years of life... whole milk is recommended because the milk fats in it is essential for brain development and what not.
Try ask your Pediatrician what he/she thinks.
Here is a link about it:
http://www.babycentre.co.uk/baby/startingsolids/cowsmilke...
http://www.medhelp.org/posts/show/733237
Also, go by your instincts. If a child likes and wants milk... I think its fine...as long as it is not the only thing they have all day, LOL.
All the best,
Susan