Sounds to me like you have a tiger by tail w/ that solution. Dirty upgrades can lead to all kinds of problem in and of themselves. Esp. when you make that big a leap. New features like the VPN Director are likely to have issues given its a major change in how routing policy is handled, w/ significant changes to nvram variables, code execution, etc.
So while it's nice that things are working the way you want, I can't help but wonder how long the party is going to last before you discover other issues.
Anyway, if it's working for you, great!