ATMega2560 ICSP

In my opinion, you are indeed thinking correctly on that.
Do you have a 100nF cap from an external DTR pin to the reset line also? Need for automated reset durung serial downloads. Very handy.