Hi Billy,
I read through your question and it appears it's been 6 months since this post. I wondered how things were going here?
Did you effectively canonicalize your old pages to your new URLs with Anchor Links?
We may be in the process of doing the same thing so just wanted to ask for an update on your outcome?
Thanks