God is commanding us to do both. I do not believe the Sabbath Principle has to be applied on Sunday. I do not believe it is about attending church all day on Sunday. I do not believe it is about any particular activity is demanded or disallowed on Sunday. I believe it is about living life in the rhythmic balance of work and rest.
Rest can mean different things to different people.
For an accountant, it may mean working in his garden. For a farmer, it may mean crunching numbers on a spreadsheet. What ever is restful to you is rest. Violation of the principle of the Sabbath cost me way too much. It nearly cost me my marriage.