Well I finally got everything replaced and put back today. Jeez -- the plastic trim pieces in the trunk are a pain to get back in correctly. I removed the spoiler and resealed, and went ahead and replaced the siren while I was at it. All seems to be working as designed!

Thanks for all the advice here.