maybe you can also add some deleted scenes to T1 since they forshadowing T2 quite well imho.
Editing T2 to the point you think Arnold is still evil I was thinking of as well. Could probably be done when its not obvious what or who the T1000 is. He could pass as normal cop in the beginning as reaction to john drawing cash from the stolen card.