I think it would be helpful to emphasize the episodic nature of bp and how some of the things you describe as common to both relate to behavior during an episode. For example, risk taking is probably most likely to happen for someone with "straight" bp when manic. Whereas, someone with bpd may engage in risk taking regardless of mood.

Good luck!