To the OP, your options are planting a known low-odor variety or keeping your plants small (i.e. less than 1/2 lb., depending on your distance from neighbors).
Keep in mind, the growing part is not the only smelly part, harvesting will reak up your whole yard.
As far as companion planting, unless you intend on maintaining tons of herbs and constantly brush up against them 24/7 to release there smell, its not going to do much. I just went to a plant sale and stood next to racks and racks of citronella plants and I couldnt smell it until it was touched.