How to pipe radiator above boiler room

Brian in Indy

Friends - I need to have my pipefitter repipe a radiator in a bedroom on the second floor above our boiler room. Imagine this - if you're standing in front of the boiler, the header goes up and left under the crawl to supply the house. Off the back of the header is a 4"x1-1/4" tee, this goes right, slopes down, then up to the radiator. There is an F&T connected to the tee, the condensate return from the radiator goes into the wet return (inlet to cond receiver piping). As you can imagine, this setup leads to water hammer, and that radiator doesn't appear to want to get hot.

My thoughts: I need him to repipe this by (1) coming off the header, sloping down as before, but putting the F&T at the end of the where the pipe slopes down and heads up to the radiator. The return on the F&T would go to return piping (obviously) and the condensate return would go to the same point it goes now, sloped correctly back to the return. This would move the F&T from right by the header to the end of the piping, and allow the condensate that builds up in the supply header to get back to the return instead of sitting in the pipe (as well as provide a better way for air to get out.

Thoughts?

TIA

Brian