The permanent fix from what I gathered is a total top/mechanics/water management replacement. They will not do this unless the TSBs for the top rub doesn't work and/or you start having fifth bow issues. From what GM has been saying it is most likely that the early build 2011s will have to have a total replacement. The later 2011 and early 2012s can be fixed with the TSBs to trim/rework the brackets in most cases.
The water management fix is a new system that is being issued when problems arise.
