Probably both. Didn't he commanded both of those corps as one before his death? The Lee split it into two?
Lee's plan to split his army into three corps was begun long before Chancellorsville and would have happened regardless of whether Jackson had been killed or not. He had felt for some time that two corps of four divisions each was unwieldy. Lee would have started his campaign under the new organization and Ewell would have commanded the third corps.