I'm running into this same problem. I think the best way to handle this might be to make all of the Admin Bar Links use the Network Domain instead of the Mapped Domain.
Still looking for how to do this in a straight forward way though.
@Ron - any idea how to make the Admin Bar Links use the Network Domain instead of the Mapped Domain?