Reading Mobile Authenticator OTP to be used in a custom page within OAAM

The problem I have with the default way, is that we are using the Challenge Choice page in OAAM, where we have customized SMS and VOICE using REST calls to our own generic service. I was able to add a new challenge choice option for Mobile Authenticator, to bypass further authentication from OAAM and directly hit the OAM Mobile Authenticator OTP page. However, if the user decides they want to use a different challenge choice, the link to go back to the Challenge Choice page takes the user back to the login page. Going from OAM back to OAAM after