Buy or wait?

Garmin should i wait for the next batch to be available (in the middle of June) or the batch after that? im thinking about the problems users are having with the battery doors.