We will be performing upgrades on the forums and server over the weekend. The forums may be unavailable multiple times for up to an hour each. Thank you for your patience and understanding as we work to make the forums even better.
I feel like 250.118 is unclear because it doesn't list the panel itself as being an EGC but then again, it doesn't list any conduit bodies as extending the ground path, but they obviously do. I feel if I were in your situation I would supplement the panel with with some wire.
But hey, you ground a neutral busbar to the panel with a green screw and that serves as your bonding jumper, so apparently panels count is a sufficient EGC.