For shorter races you need to include more intensity in the form of running fast. ME by itself will not be enough. The lay out you suggest seems very wise. I would make the Z3 runs a series of 2-5km efforts at the pace you hope to hold in the race on the flatter faster sections. Introduce these gradually so you can gauge their effect on recovery.