In sticking with the "modify as much as possible" idea we custom made pull out side mount pantrys, As there in the corner you could only access them from one side, It was a simple idea but works better than any of the shelf unit, We simply used a Blum soft close draw top and bottom and fitted a panel between them with basket shelves fixed to the panel, this also makes adjustment of the fronts very easy.