There are so many possible combinations of oil pans, dipsticks, and dipstick tubes that it's hard to say what's right. As long as the crankshaft and connecting rods don't dip down into the oil sump and whip the oil into foam at highway speed, adding another quart above the "full" mark probably won't hurt anything if it makes you feel better. The only way to be sure of the oil quantity matching the dipstick mark would be to pull the oil pan, measure the depth of the pan and the dipstick, and see how close to the crankshaft the level would be with 4, and then 5 quarts in the pan. Then mark the dipstick accordingly.
A bypass oil filter will add one quart to the capacity, and only about half a quart will drain back into the oil pan within about an hour after the engine stops.
Jerry