So the thing in my original post (https://www.amazon.com/dp/B00RZY3KZ6/?coliid=I2FH0PF9VMFRN6&colid=4JNLIGC2H9LU&ref_=lv_ov_lig_dp_it&th=1) works pretty well. I just bent them down a smidge and they grip right where there is a step in the battery, quite secure and holds the items level (without bending they stick out a little).
Ill probably order a couple more for the angle grinder and multi-tool. They do require 1/4 pegboard as they are thick wire but for me everything is 1/4 metal so that is a feature, not a bug.