My assessment is: Trump needs private security; FBI should be disbanded and replaced with an entirely new organizations, preferably multiple organizations so none of them acquires the power of the current FBI.
Texas has the Rangers, and they are LEAGUES above the FBI.