1) is totally correct. 2) This doesn't sound natural. It may depend on the verb, meaning that it should be more of a finite action, such as I wish I would win the Lottery.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.