We switched to BPA free sippys (Kleen Kanteen) a few weeks ago and are replacing all our Tupperware with glass. If/when baby #2 comes along, we will definitely replace all our bottles too.
Plastic that comes in contact with food/drink is going to be verboten in our house soon. Especially if I can find good alternatives to Ziplock bags and plastic wrap.