moving registration information to checkout pane blocks checkout

I have moved the registration pane to the checkout pane since we have a one page checkout process, but it hasn't worked like it does for other panes. All we get now isn empty checkout page with the registration information checkout pane and a 'continue to next step' button that does nothing if you click on it.

I managed to fix this by removing the Registration checkout page all together

/**
 * Implements hook_commerce_checkout_page_info_alter().
 */
function sac_commerce_commerce_checkout_page_info_alter(&$pages) {
  // Remove the Registration page.
  if (isset($pages['registration'])) {
    unset($pages['registration']);
  }
}

I was having this exact same problem and adding the code in #3 to my template.php did indeed solve it.

However, I am trying to combine this with a redirect Rule that sends the user to the checkout page when they add an item to their cart. Doing this seems to completely bypass the fix I added and creates the original problem once again - user is sent to checkout/ORDERID url which contains the empty Registration Information page. I tried sending the redirect to checkout/ORDERID/checkout but for some reason it still ends up being sent to checkout/ORDERID (redirect is maybe being overridden by Commerce Registration module?).

Anyone have any solutions to this problem?