Freediving has a complex meaning, which differs from "free diving", so I think freediving is the proper word, when talking about freediving, and free diving, when talking about (a) diving, which is free (of charge, or i.e. "free diving bunjee" could be a really extreme "one event" sport - using no rope, no rubber band
).
The other possibility is to write freediving as "apnea".
