If you haven't looked at one yet, think about a Nonsuch. Much better sailing performance than your IP but easier to handle and nice interior.