Yay! I sorted it out.
I went back to an older config file I had saved and just started changing blocks of code one at a time until i figured out what was messing up.
I guess I hadn't paid attention after getting the bed probe set up. I had the bed probe on pins shared by the heater. Its all working, for now.