I've simply cut egg yolks out entirely.

Blender yolks and make dough from them, add sugar powder and flour, then add some curd.

Take the yolks and mix them in with sugar and water, and sugar and flour I guess are probably what I want.