I would definitely go down the road Civvy has suggested. But I'd be careful about applying the additional 15% allowance for the fire alarm system.
I know that the minimum level stipulated is manual and that this place has L2 but it's not always the case that there is actual proven benefit, in terms of means of escape, in having the additional detection.
The likelihood of a fire in the main room being spotted by a person increases as the occupancy increases so the greater the life risk the earlier the warning of fire will come. The only real advantage the L2 system might have is that it will warn of a fire in an unoccupied back room somewhere. Now, unless there are some serious compartmentation issues in the building, there's a good chance that such a fire is separated from the main body of people and their escape routes and so presents less of a threat to the occupants than a fire in the main room. Therefore the advantage given by the L2 coverage is redundant as it only reduces a less risky scenario and not the one we're really interested in, i.e. the worst case scenario of a fire in the room where the people are.
All buildings are different and in some there is a case for allowing the 15% advantage but never forget that there has to be a proven benefit. The voice alarm that Civvy mentioned might give that benefit.
I would reiterate Civvy's point that the management of the premises must be up to 9999 standards if the figure of 4.1mm/person is to be adopted. If the door is 1600mm (which is implied) then 4.1mm/person gives an occupancy of 390.
Put the voice alarm in, ensure management is as per 9999 and a 1600mm door is ok for 1600/(4.1 x 85%) = 459.
Stu
ps I don't much like it either, but there it is.