I'd second the idea of adding a boom-vang! There are after-market setups available from many sources, D&R Marine has them, as does Garhauer, and any other marine hardware (blocks, cleats, etc.) suppliers, Dwyer Mast Company (D&R gets a lot of parts from them) has the one that I have on my DS II.
For sails, measure your current sails and compare them to any of the following other sailboats: Beetle Falcon, Paceship Falcon, McVay Falcon, Paceship Peregrine. All of thse boats were near sister-ships (the Falcons were basically the same boat but built by different companies over history). The Falcon might have had a smaller rig (shorter mast), but still worth checking for. My Dad had a 1950's Beetle Falcon and when he ordered new sails the mainsail was too tall..... I often wonder if the sailmaker (Smith Sails In Fairhaven, MA) Goofed and used the O'Day Osprey dimensions.....but, anyway, Dad just bought a taller mast!