hhanz: You have asked a very difficult question. I shall be happy to give my opinion. (1) I think both of your sentences are correct, depending on what you wish to say.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.