For the ultimate in keeping your gi together, wear a hakama.
ugh forever trying to get people to put on a hakima....
Glad you found the solution to one part of the problem. Hopefully you will get the other part fixed soon too. I'm betting a Hakima really would do the trick.