Fix method options on ChoosePaymentMethodType form

Fix for setting of method_options
Added ability to pass in options for the payment choice