Yes Galina you're absolutely right. 9 or 9.5 hours of night sleep is not enough for a 2 year old, especially with some night wakings in the mix. It is a good think he's compensating with the up to 3 hour nap but still he should be getting at least 10 hours straight.
I will suggest you redirecting him to his bed. Once he wakes, let him in his bed. If he cries for you, go to him, console him and walk out the door. If he starts crying again, you do the same (wi, console, wo) till he settles or till it's time to get up. If he stands and goes to your bed, you stand up, explain him it's too early, we have to sleep more, whatever you want in a short, gentle and clear sentence and redirect him to his bed. The following times he stands and goes to get you you just redirect him without eye contact or words (just explain the first time). It will be a tough job the very first days but qwith consistancy he'll get the idea that there's no point in waking since he won't be allowed in mommy's bed.
Some girls around here have had some success with a baby gate at lo's door. ALthough many of them are reluctant to use it, sp. when there's another sibling that needs to sleep (baby gate can cause lo to cry out loud and wake older/younger siblings). It's up to you if you think this solution can fit your lo's temperament.
TO get rid of the night bottle, just reduce the amount you give to him with water till eventually you're just offering plain water and he'll realize that there's no point in waking to get water only. You can also try tracy's approach of toddler pd (described in the FAQ section) and stop offering any kind of bottle (be it milk or water) in the middle of the night, if you're positive he's not waking from hunger. Once he wakes and asks for bottle, you just go, lay him down and reassure but don't offer anything. Again it's your call and you'll decide what solution will fit best for you and lo.
Good luck and keep us posted with questions and progress!!!!!!!!!