64 barracuda runs hot

My 64 runs hot while sitting at stop lights (i can watch the temp climb as i sit) but will cool down (back to center of stock gauge) after getting up to speed. The engine (273) is new and the radiator (22") was sent to the shop and cleaned. New hoses and thermostat also. One thing i noticed was the fan (6 blade) does not sit in the center of radiator. There is about 3" of rad not covered on drivers side and the fan hangs out past the rad on the passenger side, also there is about a 2" spacer that has the fan close (about 1") from the radiator. I'm thinking of building a shroud (since i cannot find one that fits a 64) and hoping this will help. Also considering removing the spacer to bring fan back and extending the shroud for more air pull. Any suggestions would help. Also vapor lock is a problem, would this help eliminate the vapor lock problem or should i put spacer under carb (2bbl)?