Simple suggestion using premade models. It would be great to make separate blocks for some of the blocks comprising/on top of the desk blocks. For example, there could be a block for the FNAF 3 desk figurines. The figurines present could be changed using the Faz-Wrench or start as just the Freddy figurine and be stackable to include the other characters like how the monitors function. The other thing from the FNAF 3 desk is just to include the hot dog and cup in the current trash block as a variant. The last part of this suggestion isn't really needed, but it would also allow for more desk variety if we were able to get a modular table with the design of the FNAF 2 desk table.
(side note, this is probably already planned/known about, but the fnaf 1 and 2 desks' fans should get a remodel to include the current fan's model)