Just placed an order for a new main from Calvert sails (it seems like posts on catsailor are happy with them). A friend found a good used pentex jib that looks like it ought to work out great.