Bees and wasps have very different attractors. For the wasps it might be worth spraying the house for spiders - their main food source for their babies. For the bees, finding out if it is a plant attracting them is a good suggestion. Alternatively, you could find a plant they like, and put it somewhere out of the way to redirect them that way.