Yes, you have it right. Sharing for joint marketing purposes must be disclosed before you can do the sharing, but you don't need to provide an opt-out.
Since you are revising your policy anyway, you might want to use the new Model form for your annual mailing this year, if you have not sent it out already. That way you could give the disclosure of your new policy to your customer base, do your annual mailing, and switch over to the new form all at once.