Insurrection should have ended with the wedding, and Riker taking his place on the Titan, and Data FINALLY getting the promotion he should have had 12 years earlier. Or maybe Riker takes over the Enterprise, while Picard stays on Baku with his love interest, don't recall her name. And lives happily ever after, and we do mean EVER after.
As for Star Trek X, it should have been set on DS9, with Voyager docked there. So we see an epic crossover, and Harry is granted the promotion he deserves. The Eternal Ensign idiocy is properly silenced, before it becomes so self sustaining that Harry's post-Voyager fate can literally never be revealed.