Yes, I'm definitely okay switching. My move would then be P-7vw.

A little something I noticed is that if I cut and paste the pieces, the cells I so laboriously merged then split back into two separate cells. So it works better if you just copy to the new cell, then delete the piece from the starting cell. Avoids problems later.

And Ric, I think your pawn move is confusing. Unless the cells are differently lined up with the hexes (a distinct possibility), you could move Pxy or Pzaa to the cell indicated, but Pyz actually straddles two cells.