My bad...did not read through your comments about merging and wrapping...

I think having merged cells can causes issues with auto fitting, but can't test right at the moment.

EDIT: Ignore this, was thinking of something else!