I'd get the battery replacement at the genius bar--the last time they took my computer in, they virtually refurbished the whole darn thing. Then you can use your older computer for trips to China. Buy a new speedy model (when available) and keep it away from China to keep from getting hacked on hotel wifi networks.