Well ... here's a sure enough "Redneck" solution. You stated that you have caulked the joints well. Why not paint the roof with a good grade of latex paint. That will definitely shed water. Then plaster the heck out of the joints with black roofing "bull".