The upgrade went fine.
Thanks for the clarification regarding the final step in the funnel being the same as the goal.
One problem though - it keeps showing that the number of members who get to the second to last step, the member added step (Awaiting Email Activation) is equal to the number who make it to the final step (and goal) - activation. This is not the case.