I spent all day trying to force DFU mode with no luck. I think maybe I borked it by loading STM firmware onto a GDM chip when I first flashed from my pi3b. Need to keep digging.
I ordered an st-link to try to recover and a new mobo in case that doesn't work. Going to solder a header onto the SWD pins while I wait on shipping.