Advanced Alerting Help

I apologize in advance for this wall of text, but I feel like I have a pretty complicated issue I am trying to deal with.

To start, the computers we have deployed have huge problems with dropping hard drives; they will basically disappear somehow unless the computer restarts and they reappear, so there's that.

So keeping that in mind, I am attempting to configure an alert that notifies my users if a hard drive in one of their machines:

a) stops responding
b) reaches less than 20% free space.

The alerts work great, but the problem I am having, is that generally when the free space alert is sent out, my users will remove the full drive and place a new one (standard practice for what we do), with the same drive name. This creates some confusion for Solarwinds, as a hard drive that could have been removed and replaced knowingly will still generate an alert based on the criteria in the trigger conditions listed below, and confuses my users.

The alert we have configured for hard drive space is below:

WHERE    (    (Nodes.City IS NOT NULL) AND     (Nodes.Status <> '2') AND     (Nodes.Mute = 0 )  AND
  (    
(      (Volumes.VolumeDescription LIKE 'R:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'S:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'T:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'U:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'V:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'X:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'Y:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20)) OR
(      (Volumes.VolumeDescription LIKE 'Z:\%') AND       (100-NullIf(VolumePercentUsed,-2) <= 20))

     )
    )

The alert we have configured for non-responsive hard drive is below:

WHERE 
(
  (Nodes.City IS NOT NULL) AND
  (Nodes.Vendor = 'Windows') AND
  (Nodes.Mute = 0) AND
  (Volumes.VolumeResponding = 'N') AND
  (Nodes.Status <> '2')
)

My main question is how can I tweak these alerts to essentially "ignore" hard drives that are replaced? I still need the alerts to be sent out when the hard drive disappears and reaches 80% capacity, but not when a user removes and replaces a drive.

Again, sorry for the long post, but I am at a loss as to how to mitigate this confusion.

Thanks