Try to identify only the part which was board-specific and add those back into the new Marlin version, while looking out for configuration options / macro names that may have changed.
Beyond that, supporting Marlin development with new boards is out of scope for me. I can only give you the pointers to Development | Marlin Firmware and a recent community topic about this that may give you some ideas.