if you are going for a swap just becase of cng/pick then take any distributer engine all suzuki g series engine came with distributer
1.6gti(G16B)/ cultus efi(G10B/A)/apv(G15A/B) are all same G series engine the difference they have from the problamatic baleno 1.3 is the distributer
if you swaped with an other double coil engine you will face the problum again
one cheap idea is to install distributer to the same engine which will cost not more than 2500