Are you in the UK? If so, buy from John Lewis.
Best retailer by far for electronics, 2 year guarantee (even though the 2nd year isn't with Apple, it is the same price with an extra year, and if they can't fix it, brand new laptop) and the return policy is great too. 28 days to return it, even if it has been used. Just keep it clean. And if a new MBP is released, they will definitely sympathise with you and exchange it for the new model.