Ageing them up fixes a lot of issues IMHO. Keep her older, though. I liked that.
He should be nearly trained and ready to leave Qui-gon when Obi takes over his training (both are friends/rivals) which leads to his resentment of Obi. Age up Obi, too.
I think if everyone is older and more established, it fixes a lot of the problems, romance included.