1. You can consider the usage of forms instead of wizards a blocker as it really is quite messy and there is no way it would got through Catherine and UX team.

2. As for the validation – well it's inconsistent, quite impossible to test and you have to rework this part anyway (it should be an easy change)