Revamping Pentax Kit

I'm just about to start the process of revamping my kit, and in fact have already started selling off my excess lenses on Ebay. Here's the plan for the new set up and any thoughts and comments would be gratefully received:

35mm - Keep existing 15mm f3.5 K, 20mm f4 M and MZ3 body. Add to line up 24-90mm Pentax zoom and 100mm Pentax Macro lens. Keep MX body as back up.

645 - Build on existing 645n with 75mm lens. Add 35mm and 120mm Macro lens.

The 35mm kit will be used almost exclusively with tranparency film either for projection or scanned and printed. The 645 kit will be mainly for monochrome use and conventional darkroom printing.

Any ideas?

This really depends on what you want to do with the kit. As primarily interest in landscape photography and buildings I love using wide-angles such as the 15mm and especially 20mm. The only two lenses I couldn't live without would be something around 20mm and something around 100mm (for the occasional portrait). The 24-90mm nearly suits that purpose.
The 645 options you've gone for sound good to me.