Hi RWarner and

Yes, work relationships/interactions can get messy. That would be difficult not to get a break at work from seeing an ex/friend. I can't imagine working with the pwBPD in my life!
This situation all sounds really fresh (if it happened this past Friday). Are you feeling anxiety about it?
It can take time to reestablish a "baseline" once that line from "not romantic" to "romantic" has been crossed. It may be important for you to find a way to sit with whatever feelings you have (including uncomfortable ones) and let things play out/wind down organically, vs trying to push for "resolution"/"resetting feelings" quickly as a way to feel better. Not sure if that's at play, but worth thinking about.
Tell me a little more about why you'd want to still be there for him -- to me, that sounds like wanting more than a coworker relationship.
This is difficult and uncomfortable stuff -- glad you found us.
kells76