Ok, Polymorph solved half the issue, and it was very simple to solve the other half of the issue.
To get it to work exactly how I wanted, I needed to select the target unit and give him a #firstshape to the original unit.
So now I have a unit that looks like a portrait on the map, and an actual unit when fighting. Exactly what I wanted
Thanks again!