First, I would probably go with the newer Bimare than the older one. I also have a 96 Waterat that is being rebuilt right now. New Paint job, new main beam, carbon mast a choice of sails depending upon what you want to spend. 1 Ulman older with the boat or a New Ulman or Irwin sail 900 and 800 respectively. The sail of choice these days seems to be the Glaser Sails as cut for Lars Guck. I know that there are probably 4-5 other sailmakers that are truly competitive. Ashby and Landerburger are the other two predominant sails available. My boat will be ready in April, possibly March if I get back to work on it. What is your budget. If I remember correctly, you were in the 4000 range. I still say keep your eye on usaca.info for boats as they come available.