This is how it should go down: Finally schedule some personal time together (hell give us a whole chapter just for this trip), let Lana's lover take her o Rishi (remember "I could see making a home here" choice), meet Jakarro and C2 D4 (they need to make a comeback at some point), have Jakarro hand over the most beautiful ring in secret, take Lana to a cottage on Rishi Village and (after some added creativity from the developers) ask Lana to get married.
Personally, I wouldn't wait for all the comps to be back, besides, who'd want to dump Lana for an old companion?