Good points. The new IFRS 15 tries to deal with those issues, and defines principles of performance obligations, un-bundling etc., which should be helpful in this case.

I'm sure the Big 4s have issued Q&As and position papers to their audit clients already on the adoption of IFRS 15, but this is going to be a nightmare to implement...