Question about changing copper pipes on water line to hot water tank

Since we had a water softener installed the lines that were previously installed are not in optimal locations - See Picture 2. If I set it up like I have shown in Picture 1, will this work properly?

I have a T intersection with the bottom line going to the shut off valve then going to going to the hot water tank - This is for illustration, I will have the shut off valve a little further down with copper tubing in between. The top going to the rest of the house and right side of the T being the entrance for the water supply. In theory, it beats the tangles mess of elbows that is currently set up. Just want confirmation that this set up would be okay, and any suggestions. I have all the pieces I need to complete this and some extras just in case.

Personally, I am having trouble seeing exacting what you have vs what you are planning.

What is that unit in the tray?

I would have to see a little schematic sketch of before and after.

Start your explanation from scratch, your original post is too rambling and vague.

Post some drawings or diagrams.

And zoom out more in your pics.
Show more of the whole arrangement.