All the Fujimi AE86 kits have the cage, spotlights, fire extinguisher (not NOS bottle!), as they are also available in a "Rally version" which uses all those bits. Theres also a group A touring car version but to be honest I wouldn't know what extras you get in that .
Doesn't matter if its 3 door, 2 door, trueno or levin they should all have those rally bits though.