When we start bringing and consuming the Korban Pesach again (speedily may it be, in our days), will the Korech step of the Seder be moved to adjacent to Tzafun or possibly replaced by it?
Kadesh Urechatz Karpas Yachatz Magid Rochtza Motzi-Matza Maror Korech Shulchan-Orech Tzafun Barech Hallel Nirtza
or
Kadesh Urechatz Karpas Yachatz Magid Rochtza Motzi-Matza Maror Shulchan-Orech Tzafun Korech Barech Hallel Nirtza
or
Kadesh Urechatz Karpas Yachatz Magid Rochtza Motzi-Matza Maror Shulchan-Orech Korech Tzafun Barech Hallel Nirtza
or
Kadesh Urechatz Karpas Yachatz Magid Rochtza Motzi-Matza Maror Shulchan-Orech Tzafun(=Korech) Barech Hallel Nirtza
The reason for Korech is that there was a disagreement between Hillel and his contemporaries, recorded in Talmud Bavli Pesachim 115a (English summary), regarding whether to eat the [Korban Pesach,] matza, and maror together in one wrap (Hillel) or separately (contemporaries). I put "Korban Pesach] in brackets in the previous sentence because whether the Korban Pesach was part of Hillel's wrap is the subject of a later disagreement between Rashi and Rashbam there, who hold that it was, and Rambam in Hilchot Chametz Umataza 8:6-8, who implies that the wrap was only matza and maror, while the Korban Pesach was eaten separately.
Tzafun is a placeholder for eating of the Korban Pesach, which, as encoded in Mishna Pesachim 10:8, must be the last food consumed on Pesach night.
Therefore, when we restore the practice of Korban Pesach, we will presumably eat it in the Tzafun slot in the Seder. If we follow the Rambam's interpretation of Hillel's practice, then that plus the Korech we're already used to, on the schedule we're used to, fulfills both Hillel's opinion and that of his contemporaries, since they agreed that the Korban Pesach was eaten by itself, at the end of the meal. However, according to Rashi and Rashbam, fulfilling Hillel's opinion would presumably require making a wrap including the Korban Pesach, presumably at the end of the meal.
According to Rashi and Rashbam, would Korech have to be at the end of the meal?
Would it be before, after, or in place of eating the Korban Pesach by itself (Tzafun)?
Is it possible that we will, in fact, practice in accordance with Rashi and Rashbam? Does the current placement of Korech where it is instead of at the end of the meal already indicate that we don't?