House Bill 31 signed. Make the switch?

State workers will now have the option to switch over to the traditional teachers retirement plan. I’m currently on the optional plan that is treated like a 401k instead of the pension.
As a state worker we do not pay into social security but I do have 30 credits from other jobs.
I’ve likely got a 400k inheritance coming in the next couple of years and am 40 years old with 350k in retirement already. Worth making the switch?

Here’s the math
Stick with current plan: I put in 8% state puts in 6.2%. Currently $8600 from me, $6790 from the state. So $15k a year is what I have going in a 401k.
Switch: State takes 8% per year: $6790 and I’ll get back 2.5% of highest 5 years. I can pull at age 62 or at 20 years of service.
I’m vested at 5 years so if I quit after 5 years I have to wait till I’m 62 and I’ll get my 2.5% x years of service. If I quit before 5 years I get my 8% back.
Example 1: Switch and quit in 5 years. I would have put in 43k. I then wait till I’m 62 and I’ll pull 13,500/year till I kick the bucket.
Example 2: Switch and quit at 62. I’ll pull 54k a year till I kick the bucket.
Either example my 401k would also be paying for retirement.