Reb E & Chacham Tzvi > I would be matir kitniyos as the more matzos must be baked it becomes harder to watch out against chametz.
This is a case where a humrah is not a humrah because it is a kulah in another aspect. Just had it on the Daf Yevamot ~ 30.