Switch between free transform and warp mode

Hi PS team,

I was wondering if more handles could be assigned in the warp mode,  the current 16 handles seem not up for the job for precision editing such as horizon and sea level involved when stitching several frames together. Thank you!

Cheers,

Donald