Will 2004 WJ head fit 2001 XJ ?

So, I've come to the conclusion that I either have a bad head gasket or a cracked head.

Since my rockers and pivots are pretty worn anyway AND if my non-TUPY 0331 head isn't cracked it may always threaten, I figure a decent used head at a good price would be a smart thing to put on as long as I had it apart to check gasket anyway.

My understanding is Jeep wrangler 4.0 from 2002-2007 with TUPY markings is good as well as Grand Cherokee 4.0 from 2002-2005 with TUPY markings.

Is this correct?

Also, I assume I will want to take the new(used) head to a machine shop prior to mounting it...? If so what do I ask for that sounds more intelligent than "make it flat" and how much $$ should that run me?