It seems to me that adding five years to the separation guarantees that 5 years elapses from the time of the change and the separation date is immaterial because it can't accelerate the payment date, but, what do I know about IRS compliance. Interestingly the plan states that if you attempt to change the plan less than 12 months from initial payment then they tack 5 years onto the separation date to assure compliance but in my case that's not when I changed it.
I really appreciate the you guys taking the time to respond. I'll bounce it off a 409A tax specialist before I take any further steps and I'll update the post with what I find so it can help others.