It really comes down to what gives you the most bang for your buck for two points given your playstyle.
Close Quarters is decent but I don't consider it mandatory, and 2/2 is just wasteful. I use Force Leap as a gap closer, escape tool, a last resort interrupt or to help peel for a teammate. I almost never use it as a focus builder. I suppose there's nothing wrong with using it for that purpose but I don't so CQ has limited value for me.
As for Force Fade, I can't comment on its usefulness in PvE because I don't have much experience with high-end PvE content. As far as I know Force Fade could be beneficial in every fight in every flashpoint/operation. From a strictly PvP perspective though it's rare to really 'need' it.