... ; Would you write two separate addenda for this or combine it ... would personally write two separate addenda. My reasoning is that the ... tie together into one cohesive addenda.
Yes, I absolutely would. You said yourself they are a top consideration of yours and I think it would help immensely for you to express that in a separate addenda. And yes, it is acceptable to add it on as a supplemental addenda!