I haven't got a second device to hand to test this right now, but there's was only a small bit of code forcing 1-1 pairing so this SHOULD work now. Feel free to try, or I'll post again once I've had a chance to verify.

Seems to work! The UI for switching boxes is a little fiddly but it does work. Thanks!