No mate, there is diversity, and that is it. Dont read too much into diversity, it is overrated. The simple maths is, add up all the values of your fuses and breakers or whatever, then multiply it by 0.4. This is near enough for calculating maximum demand. The chances of actually achieving maximum demand, are about the same as winning the lottery.
Where all this diversity stiff goes pear shaped is this. Lets imagine a 3 bed semi, 2 x 5a lighting circuits, 2 x 32a ring finals. 5+5+32+32x0.4= 29.6a. You rewire it, and split things up a bit, same amount of lights, and same amount of sockets, but you put 4 lighting circuits in, and a 16a radial to each room (7 in total), all 60898 MCB's.
6+6+6+6+16+16+16+16+16+16+16 X 0.4 = 54.4a.
So your maximum demand has changed, but nothing else has.
Cheers...........Howard