Looking much better. The plant is old enough and large enough now that it is appropriate for it to be in a soil with some ferts added. When it was younger, the exact same soil was too strong for it.
The leaf edge curl is only of limited concern at this time; keep your canopy temps down and the plant should recover.
Aquafina isn't distilled; it may have minerals in it that you don't want but that make the flavor better as drinking water. Just use plain old boring tap water. I even run HYDROPONICS on city water straight outta the tap, not even allowing it to sit out like many growers recommend. If your tap water is really unusually bad, rain water that you have adjusted to pH 6.5-6.8 before using is okay, or distilled water from the grocery store, but with both, you have to add calmag to it. Tap water is preferable. It already contains calcium that your plants need.