Did you replce the seal at the top of the windshield ? Part# 51317182004?
It goes along the top of the windshield. Mine had deteriorated and was causing a leak.

Otherwise remove both front A-pillar interior trims and see if your front sunroof drains are kinked. These and door vapor barriers are the most common source of leaks