Well after further review, a new bike it is.
So after changing out the wiring harness it still was acting the same way. So I told them at this point, no more trying to fix it and just get me a new bike. And of course they sold the other L frame model they had, so they are going to have to find...