May i clarify something? In the time of the Mashiach, it will be BAU with recognizable halacha with some adjustments. Olam Haba is a different platform, with no way to know what will in fact be, and quite possible not anything supporting our concept of marriage.
AND: MINOOS AlERT; our souls are not part of Hashem, we acknowledge the indivisibility of Hashem twice daily. PSA