We went through the same thing, with both the Builder and years later, a tileman. Neither seemed to know how to lay in a shower floor that wouldn't leak. The third time I chose the Schluter Kerdi system, which is engineered using high density foam and the result has been excellent, with no leaks in 15 years. Good luck with your solution.