Great job.
To stop the waffling of the E string, you need a set of thicker strings.