I took fenugreek and it was a great help to me. Max dose though and regularly 2x tablets 3x a day. In my case my supply went up within 24h. I did have to take it all the way through till we stopped BF at 1y. No issues for baby and no curry smell for me either.
Have you tried hand expressing straight after pumping to get more out and doing a pumpathon (pump, break 10min, pump, break 10min, pump etc) to simulate a GS to increase your supply?