So here's the fix with new cabinets (not quite the final design, but close).