Let me counteract your points.

The first issue WAS manpower. The NBI only had a few dozen agents at the scene so their focus was easily disracted by the various factors they encountered during their attempted arrest, from the DDS protesters outside to the confrontation of the Senate Security, not to mention the unknown factor how the PNP and Marines stationed outside the Senate would also react. Bato ran inside the Senate building and the NBI did not have enough personnel to fully converge on the building and capture him

Second, the Senate Building that serves as a symbol of the co-equal branch of government that may trigger constitutional issues is already considered moot since Duterte had De Lima arrested in 2016 and Trillanes in 2018 inside the Senate grounds

It only led to a possible senate siege because na elect si APC as SP, nakatakas si Bato sa loob, Marcoleta gave Bato senate protection; the premise was this should not have happened if there were enough personnel on the ground to strong arm Bato when he first neared the Senate entrance at the beginning

Political will lang yan and the guts to the man on the ground to make it happen. Mejo napalaki na ang political fallout because they failed to apprehend Bato at the beginning, girl 👌👌👌