We would like to have a context driven button that displays submit when there is no payment block used and use Next, Continue or Submit & Pay when there is a payment block in the form. When you reach the payment section change Pay & Submit to Continue to Payment Information.
Yes, please do! Pay & Submit confuses people and they think the form is missing a step.