Waitrose takes on M&S Food with 7,000-sq-ft neighbourhood stores