Nice! I kept the cummins and added a raptor. But I do agree that the smog system sucks.
I would've kept mine, it's an 04 6 speed with the full Carli treatment and had brand new rubber to boot. Passed it on to my son, it was his dream truck! When I move to Montana here in the next year or two I will likely either pick up a 12 valve to build or p-pump a 3rd gen. Mean while modding the Raptor will keep me plenty busy.