Can you move to the RC7 RCBugFix code base? It will be much easier to figure out what is going on with that code base. You can get it here:

https://github.com/MarlinFirmware/Marlin/tree/RCBugFix