Bedding in organic pads is very important for a different reason than metallics. You actually need to get the pads hot enough to release the oil in the surface layer to produce a "dry" layer on the pads. In use this dry layer then works it's way down through the pads as they wear. If not done properly the first hard stop greases the rotors.
Shimano offers several upgrades to remove heat before it gets to the pads, and before it gets to the 2 piston calipers.
Shimano Icetech rotors from the XTR/Saint groupset. They run much cooler than solid steel rotors. Freeza versions run even cooler and have more metal to prevent bending. They dump a lot of heat before it get's to the pads. RT-86 are the 6 bolt Icetechs, RT-M905 are the 6 bolt Freezas. They used to be Centerlock only.
To Build Closer Relationships between People, Nature, and Bicycles. We believe in the power of cycling to create a better world as we move forward. We inspire all people to enjoy our products in their everyday lives and where they take them.
bike.shimano.com
With the problem you're having you should probably step up to the 203mm size. If you stick with 180 I would get the Freezas.
Shimano J04C pads may help solve your problem. But with brakes I would want a bigger safety margin than that.
SHIMANO DISC BRAKE PAD METAL WITH FIN J04C-MF 1 PAIR. SHIMANO Original parts and the right maintenance makes this excitement possible for you, every day.
bike.shimano.com