Sorry looks like you didn't get any replies yet. This post will give your thread a bump though.
Have you considered moving the nap a little later to discourage the earlier morning?
You could begin the nap a little later and still wake at the same time, same BT and see if the night lengthens back to the full 12hr you had.