Update on my issue:
the rough idling and engine shaking or "dieseling" issue has resolved today when i replaced my no. 2 injector on the fuel rail. I've checked yesterday for the diagnosis for all of my injectors and they found that the injector no. 2 was the fault.