I'm not sure if you'll need the 40P or 48P TT heads because I don't know if they ever changed the NA. For your careabouts, the different is the connection to the lower plenum is different between the 40/48P.
The oil filter tree (or maybe just the part that goes into the block and the stop-valves?) is different on the NA engine, but I don't know if it's required to change it out.