I did some experimenting and tweaking of the rotation myself. Hope this proves to work better. I managed to squeeze in one more Touch action, bringing the total from 8 to 9.

My stats are 405 Craftsmanship, 375 Control and 388 CP (345 CP + HQ Bouillabaisse). It's possible to do with the minimum required stats (391 Craft / 374 Control), but CP should be at 388 regardless.

Comfort Zone
(*)
Inner Quiet
(*/)
Waste Not II
Steady Hand II
Piece by Piece x2
Hasty Touch x5, until 45/80 Durability
(*)
Comfort Zone
Master's Mend
Steady Hand II
Hasty Touch x4 until 35/80
Steady Hand
(*/)
Great Strides
(Innovation if ToT was used at least once)
Ingenuity II
Byregot's Blessing
Careful Synthesis II x3

Notes:
(*) and (*/) indicate the start and end periods when you can use ToT if it's up. Do not use ToT outside of these periods.

If you're about to use PbP but the item condition is Good or Excellent, postpone PbP and use Hasty Touch instead.

If you've managed to use ToT once, use Innovation after Great Strides. If you've managed to use ToT twice, change a Hasty Touch to Basic Touch as well.