8 month old MBP. Recently had to have the HD replaced under warranty. Still experiences some issues:

When the battery level drops below about an hour left, the MBP just goes to sleep by itself, even if Im in the middle of typing or whatever. I have to wait a couple seconds, and the only thing that wakes it up is pressing Return a couple times.

When this happens and even when it doesn't sometimes, my battery level indicator drops down to 0% and constantly sais "Calculating" when I know there is at least 50 minutes of battery level left.

According to Auto Update, I have all the recent software updates.

Any advice or should I be making ANOTHER trip back to the mac store for warranty repair??? Thanks for any advice!