Sounds like someone added sails from a larger boat before you acquired it, thus both the main and jib are oversized. If you stay with these sails, I would just remove the battens from the jib since it should still work pretty well without them. As for the main, you probably need to do some cutting and sewing (or have it done). You could either take some off the top and make a squared-topped sail, or you coud take some off the bottom. Either one should be fairly inexpensive to have done at a local sail shop, although I've found it pretty enjoyable to do such work myself.