I think the yardages you have listed would be good - you will have a bit left over, but - it's better to have it and not need it, than to need it and not have it.
This allows for shrinkage, maybe a cutting error or two, and a bit of wiggle room for design placement.
Sometimes shifting the cut a bit one way or another makes the fabric pattern work a lot better