Just to clean up the looks, you can shorten the pipes in the top loop so that the loop rests on the edge of the tank.
Also, you can turn the tee against the tank so that the future plumbing will not take up a lot of space.
Most importantly, get rid of the cap. It is going to cause both you and me more problems than either of us wants. Add a ball valve to the tee so that you can tune the system properly.