I need to update the 1-1/2 PVC 80 nipples coming out of my heater. The connection between the nipples and the schedule 40 pipe leaks. Looking at the picture, any thoughts on improving this? For the pipe closest to the camera, I was going to add two 90-degree elbow to make things "cleaner" and the flex pipe isn't at a wierd angle. For the pipe firthest from the camera only thing I can do is extend it a bit (2") so it clears the other pipe better.