That swap would be more trouble than it's worth... The engine is different as the 4.8is is a valvetronic motor so the harness and DME are completely different... The transmission is different, the transfer case is different, and all of the control modules need to communicate with eachother. The only way to do that would be to swap out the whole drivetrain and all of the computers and the whole body harness as there are extra computers on the 04 that aren't on the 03, such as the transfer case control...
Basically, it can't realisticly be swapped, So I'd stick with either your current rebuilding project or buying a longblock or shortblock used, maybe LKQ has an engine for a decent price.
http://www.lkqonline.com/default.aspx