At this stage the only suggestion I have requires modifying Wire.cpp to include an I2C_SlaveAddressMaskSet command.
There may be (or should be) a function to do this from the setup.
