Hello Jussive
1. Yes, I'd call it a type 2. (Other types are also possible, e.g. "If only I had known!" – type 3.)
Although it's true that the sentence "I wish she would contact me, I would be very happy" lacks a conjunction, I'm not sure we can infer that "If only she would contact me, I...