I like Insurrection, so I wouldn't change a lot. I agree with the moral dillema, feeling that the needs of the many don't always outweigh the needs of the few.
Take out the silly boob joke and pimple joke, and to me it's still a fun film. I will agree that as a film, FC was better. But to me, Insurrection was the better Trek movie.