Refactor marriage abroad v2 next node

- Refactored next nodes to match @dheath's changes whilst keeping the new logic from the latest updates and changes.
Merge pull request #956 from alphagov/marriage-abroad-next-node-refactor

Refactor marriage abroad v2 next node