I have recently purchased a Optiplex 7040, i7-6700, 1TB SSD, 16GB RAM. It came with an upgrade of a 240w PSU installed (bonus!). 
Now after reading multiple forum posts, I've seen people who have tried to upgrade this same rig, it's hit that age where it's at a cheap and still viable usable machine, so I purchased it for a friend. I'm now considering a GPU to use with it, and I am hesitating whether to take the plunge and stuff a 1030 in there, which would meet the load requirements of the total recommended use (in calculation) but would be straddling the line, or perhaps go with a 710 instead that would take about half the power average power usage and is a safer bet. 
Alternatively, I've seen some POSSIBLE recommendations for upgrading the PSU to allow more wiggle room, but any concrete solutions that anyone has come up with?

Does anyone perhaps have any thoughts or in this case?