I'd say it's one of the two. I replaced the cowl on my 2013. Seemed to work for a while, but wasn't until the sunroof drains were replaced that the issue was completely gone. Replacing the cowl is an easy DIY job. Sunroof drains were a no go for me, so opted to let the dealer handle that one.