Waitrose outpaces John Lewis as it pushes ahead with £800m overhaul