What you describe is actually very close to what I’m planning to implement. As you said, compensating the phase shift is one of the main challenges. Also, when interpolating between wave parameters, ideally the wave parameters should be sorted in such a way that the we interpolate between similar values.