To get both those options to work, you’ll need to swap door harnesses with ones I make, add a harness inside the cabin and swap in the correct power fold switch.
Basically, it grabs those missing circuits from the BCM, X61A junction block, etc. and brings them to the doors. Then carries them...