I've found that one of the best ways to work on #2 is to search on pinterest for photos of lavishly catered upsherins or watch ad teasers for pesach programs. The general disgust that it musters up in me is enough to recommit myself to a life of reasonable moderation.