Semi-/Permanent bonuses from food lasting for an entire fight or until you switch them out would also be a good change.