Yes, I would include both because the shot noise depends upon the intensity of the input signal. Generally the rule of thumb is to use a Bessel filter with a cutoff frequency of 0.75 * Bit rate. But you could optimize this for your system by trying different values.