I have a 88 XJ and changed my heater hoses in 2000. I used aftermarket hoses but they did not fix right. A couple years later when I changed coolant I installed new heater hoses from the dealer. The dealer hoses laid right and looked "correct". The aftermarket hoses even if they were the right PN looked "rigged."
I also pulled off the heater hoses, went to my work bench and cut off the aluminum bands. I installed new hoses using stainless steel hose clamps. The Tee looked just fine to me, not sure why you want to re-invent the wheel. I also got a new heater control valve and mine looks like the one posted. When you go to the store to buy the valve be careful, there is a catalog error and they only have a 2 port valve, not the 3 port you need. Be patient with the parts guys as they try to find you the right valve.
I also recommend if you still have the pressure bottle you need to replace it. You can get a new one from quadratec.com for $20 or so. There is also a mode to install the moroso surge tank but it requires mods to use.
Also when you pull of your heater hoses from the heater core slice them and pull the rubber away from the nipple, do not twist them, there a chance of breaking a joint in the core and causing a leak.
while you have the heater hoses off you may want to flush the junk out of your heater core. You will need two 4 ft pieces of hose, one 5/8 and one 3/4 and install a female hose end the hoses. Install the hoses with hose clamps, then begin to flush. Flush forward and backward until the water runs clean. I collected my water in buckets so I could tell how clear the water was, if you look at it coming out of the hose it looks clean but collected in a bucket you can tell how dirty it is. After I did this I have plenty of heat, my 70 year old mother complained it was too hot with the temp in the middle of range on a 20 degree day.
Good luck!