You seem to be trying to duplicate the pre-processing calculations of various existing DTI processing packages. The package from NIH is called TORTOISE, and has excellent eddy current corrections built-in -- among many other features. We work with the TORTOISE group, and don't really want to spend effort to replicate their years of work.
https://science.nichd.nih.gov/confluence/display/nihpd/TORTOISE
