Yes the 30Q’s will fit. The Samsung is universally regarded as a very good (HKJ included) battery.
You’ll have to find it there. Page 36 & 40 I think