I've had really good luck with Bacon Sails out of Annapolis. For the main, you need the "E" and "P" value and for the jib you need the "I" and the "J" value. Then you can shop for used sails that did not necessarily come off of a Catalina 22. According to sailboatdata.com your dimentions are
For the J-value, anything over is listed as a percentage. For example, your J-value is 8 feet. A jib (or Genoa) that extened past the mast by 0.8' would be considered a 110 jib (i.e. 10% past the J-value)
Here is a diagram I captured off of "sailboatdata.com"