It sounds like you're doing everything right. It might just take a few days to kick in - and if the BC pill was affecting your supply, you might have to wait to get it out of your system. Fenugreek usually starts to work in about 3 days, if it's going to. But it also works better if you combine it with Blessed Thistle, so you might want to try that too (I think you're supposed to start smelling like curry or something if you're taking enough Fenugreek...). Doing the intensive nursing and pumping like you are will help - can you keep it up a few more days? If none of this really works, there's always the option of Domperidone to increase supply. Is he still waking at night to feed? Nursing overnight really seems to help supply - so if he's not waking, you might try a dreamfeed sort of thing.
But above all, if you can, try to relax a bit! Stress and worry will just make things worse. There are still lots of options - hang in there!