N97 hardware problems

Just bought a new N97 last Friday and already having all the main problems that are had with the phone i.e the GPS lock problem, keyboard rattle and the phone's camera already has a scratch in it. I haven't even had it a full week yet. I emailed the place I bought it from and asked about the new backplate that fixes all but the keyboard problem adn they said there is no way to tell what batch of phones have the new backplate on them.
My question is does anyone know when the revised N97 might reach the market? I'd say if you could get one that has the v20 firmware preloaded on it from the factory then I would have the modifications. How long does it generally take for the new firmware to reach the current market? Thanks.