Hello Roro
As you know I'm an English learner and I myself am not so confident about between the simple tense and the progressive tense. So please use the following as something like junk food for your thought until native speakers give you more decisive answers.
Q.1)
I think you should change...