Ok first off, I'm sorry for the necro bump, but I felt it necessary to post since the OP did not follow up.
I performed the fix suggested by Kbliznick. Instead of cutting the diodes, I desoldered them and relocated them to the sollenoids. Works perfect! The flasher flicker is totally gone.
Thank you kbliznick for sharing this info!