Payment method appears twice on registration

After selecting a payment plan, the user is asked to confirm the order.
This confirmation includes an option to select a payment option and then to click the button to create a new profile.
(we use the registration option)
After completing the profile creation, the user is brought back to the order confirmation page.

The option to create a new profile is now gone and the member can continue to the checkout.
However, the option to select a payment method is still there and it has defaulted back to the original setting.

Whats the point of showing the payment method early on in the process (and allowing you to select a payment method) if whatever you select is simply going to be ignored.

Many of my members have selected a payment option, gone through the profile creation process and then clicked check-out, not realising that their earlier selection of payment method was no longer selected.
Its pretty confusing and its causing a lot of frustrating with members selecting the wrong payment method.

Can the payment option not be hidden until actually needed?
Or at least moved below the profile creation button?