Origami complete and the requisite number of shapes identified. I found highlighting 22 squares in the grid on my spreadsheet made the end game a lot simpler than I had feared. The NW and SE corners of the puzzle had me going round in circles for hours and I found no other approach other than trial and error. All done now.
Ploughty, with ref to my previous post you need to look at the clue for 23A as well.