Your version sounds way nicer to me, actually. In my mind, flan shall forever have the connotation of "that dessert which someone will invariably try to make you eat after you've already had way too much Mexican food."