Its been a while since I have calculated equivalent circuits; however I am getting different answers than you. How are you calculating the equivilant impedance? How are you calculating the Thevenin Voltage and Norton Current? One thing I would comment on is your notation. Use a universal notation that you should have been taught eg, Vth is Thevenin voltage, Rth Thevenin impedance etc