Find the Jeep Water Leak Manual. If you can't, PM me and I'll send you a copy. That should be a sticky around here but for some reason it is not.
In there it details the part numbers needed for all of it. the dealer can get them for you. At least mine did. they were very nice about it.
incidently, mine still likes like mad on the soft top. but I think new foam on the door surrounds will fix it. drips straight down onto the door pull. In a steady stream. A drip i would just put up with.