Waystone Quantity is too low

Even though i have skilled almost all "increased quantity" notes for waystones in my Atlas, i still struggle to find enough waystones to get through the endgame without repeatedly buying.
Maybe this is just a case of bad luck. But i really think 1 Waystone per map should be the absolute minimum. I feels just bad to constantly having to worry about if i can do maps or if i have to buy my way back in.