Great! Looks like progress.

I do suggest looking at autorandr (or similar). autorandr stores your X geometry as profiles, and can detect changes and run scripts.

I haven't used bspwm in a long while; I ended up preferring herbstluftwm, but IIRC you have to tell bspwm to configure each screen and delete unused workspaces when you change. It felt more fussy to me, which is why I landed on hlwm.

Anyway, try adding a line to tell bspwm to "remove" the monitors you aren't using. It doesn't detect and remove these itself. Add the lines (after your desktop DP-1 -d setting:

bspc monitor eDP-1 -r
bspc wm -o

Swap out eDP-1 with DP-1 when going in the other direction.

The bspc wm -o is pretty important; it tells bspwm to re-lay everything out (or, at least, that's what I guess it's doing). In any case, it fixed a lot of issues when I ran it when changing layouts.

I found the bspwm community to be largely unhelpful, and containing some caustic people. It very much has a "give a man a fish" mentality. Given how fussy the wm itself is, even after quite an amount of time scripting it, I still felt as if I were casting about most of the time, getting things right only by trial and error, and not being able to reliably predict how my commands would affect the wm.

If you find yourself in this situation, try herbstluftwm. The community is more helpful, and the WM itself seems more intuitive. For instance, while it allows you to define virtual monitors, it does require fewer commands to deal with physical monitor change events. You still get the "all configuration is done with commands", but it seems more... sane and consistent. It's just my opinion, but I appreciate the WM, whereas with bspwm I just felt like I was fighting it all the time.