I obviously have dwarf for 'regular warehousebles', but I've been playing since day 1 so virtually my entire WH are collectibles of a sort. A lot of them are untradeable as well.
Adding bunch of warehouse slots will solve the issue for years to come.