I went for a Kabuli CVT gear as repair was not recommended. Also I know someone who is going to upgrade his Vitz to 1300 and he is replacing his 1000cc engine and grear with new one. He is planning to sell his perfectly functional CVT gear which can be tried in his car. If you are interested in trying it out, I can hook you up with him. The down side of buying a kabuli gear is that you can not try it for long, so a tested gear would give you higher confidence level.
Please mention my username if you reply to this post, as I dont visit pakwheels much these days (mentioning name generates an auto-email, that is how I noticed your post