Use SPA wait-to-finish if SPA_ENABLED is True (WiP)

this should be wrapped in ``SPA_ENABLE=False`` because it will probably be on by default one day :)