[quote=@Double]
How do you think I should fix my little timeline discrepancy?
[/quote]

You can move the conversation between Yuna and Riku a day or two before, then mention the 3d Printing in passing as you give your reaction for what happened during the meeting, that way Kai can bring up trying to fix up the Turn XCEED Gundam.