I changed the pullups to 2.2k based on the graph in the I2C specs of 2000. I believe since I am using all MCP23016s and they are 'fast' devices, I should be fine.

The waveforms have a bit of roll-off on the leading edge but look better.

Has anyone used the switched pull up circuit from this refrence?