Mash / Cinelli Vigorelli

I'd go 32 (possibly even 36) spokes front and rear with a shallower rim depth. The wheels will be stronger, and all things being equal more reliable for longer. I have 36 front and rear and those things can take a beating without needing much more than a very light true once or twice a year