Your friend is correct. Make sure you let off the downhaul as well.

Furthermore, your apparent wind is so far forward than sheeting in is actually the correct trim for the main.