I just now have the exact same problem as you described. We’re you ever able to figure out a solution?
I’ve got an OEM replacement cover on the way, but it looks like part of the base of what is left is not flush to the roof. Which might be a problem later.