OK... Because there was more 'mature' code in your Marlin_main.cpp file. We can proceed however you want. Probably, it wouldn't hurt for me to cross all of the current changes over to my code base. After doing that, it probably will make sense to cross your Configuration.h settings over to the new Configuration.h (although I don't see a problem with what you have) I can do that for you in a few minutes. At that point we will both have the same code base and we can start figuring out what you are seeing and why it is happening. Will that work for you?