I put a '91? or '94 (not sure)? TOYOTA grill on my '96 in place of the sombrero.
I did not need new headlamps, trim etc.
I -did- have to modify the screw placements going into the headlight buckets. The '96 headlight buckets have two rectangles (each) for the screw receiver snap in bit. For the '96 grill they sit in the forward/inside buckets. To fit the older grill I cut off the forward/inside buckets and moved the snap in nut thing to the outside/back rectangles in the buckets.
At that point the grill looks like it would have buttoned right up if it weren't for the gigantic marine switches that I have where the horn normally goes. Since I also installed a pusher fan, it required my switches to be nearly flat instead of angled down behind the grill. So... I cut the grill to fit around them.
I have my somewhat beat up old '96 grill with some chrome delamination available if anyone needs it. Shipping it wouldn't be cheap though.
Note... my truck is -not- a show piece and what is acceptable to me may not work for all of you.
I thought it was pretty freekin' cool how easy it was to fit it all together though.
IMHO YMMV