I don't care for the fluid filled motor mounts...
How's the transmission mount?
Regardless...when I had poly mounts I just got rid of the flex to take care of the possibility of it failing in the future.
As for the knock...I'd get a real tune. Might be able to fix it.
Also: if you've got that knock on the stock pulley, the last thing I'd do is drop to a smaller one.