I agree with your proposed solution, if you're packaging for different platforms, while requiring some more work on your part I think the results will be more favorable.