Current laser com systems are getting multiple bits per photon - it seems that the communications field will keep pushing the limits until there is simply no business case, and then push some more. Really, the only limit is Shannon's limit, but that's only concerned with data rate. The modulation schemes that sit on top of the raw data is where all the capacity magic happens.