If your going to replace the solonoids, I'd also purchase a shift correction kit and put that in - in the absence of pressure testing, etc.

An ounce of prevention provides a pound of cure!