the new growth looks good! id stay with the lower ppm's for awhile and then slowly start to raise them back up once u are into flowering. Id stick with the RO water & CalMag+ it seems to be working.

The yellowing on the lower leaves is probably permanent, just make sure the new growth doesnt start to yellow up on you (that means u still have a problem!)