You definitely need to leave him. He can then reorganize his kitchen till the cows come home - HE said "it can always be reorganized" so let him enjoy the process.