This would be my preferred solution, but I'd like to keep magic items an optional part of the game.
With the rebalancing of math for the new edition, I would hope that +X modifiers from magic items won't be assumed, but, as Dreadnought pointed out, we've already seen that there are +6 wands, etc.