If you are really serious about fire protection in that closet, rip everything out and install 2 layers of fire-rated drywall everywhere. Tape and mud the first layer, then offset the seams of the second layer over the first layer, and tape and mud that too. ALL penetrations need to be sealed...