Exactly. Whoever you hire to tune the car will know how to turn off the EGR in the tune file. It's dead nuts simple.
If you're staying returnless, you need a returnless rail. I've seen people rig up a return-style rail by blocking the return, but that is NOT the way to go about it.