Thank you Oomis. Either way is fine, although I found that the non-gebrokts cakes that my ex used to make were always better (lighter, fluffier).
They also have the advantage that they can be eaten on Erev Pesach as opposed to the cakes with matzah meal which cannot.
My ex would bake some non gebrokt cakes for me to take to work on Chol Hamoed Sukkos, because they are shehakol and don’t require a Sukkah 🙂