Need some input on Nidalee Jungle builds.

Here is the build I typically use. Pretty straight forward, 40% CDR, High AP, MPen and glass cannon. It works well most of the time but I run into problems when 2 or 3 of the enemy team is tanky. Their front line prevents me from easily targeting my primary targets (carries).

I use something like this to poke tanks and bruisers a bit better but I find it awkward to jam in mana/mana regen into this build at some point. Alt:

This build provides me with a deep mana pool but is difficult to jam Mpen into it and doesn't reach 40% CDR without runes.

Any tips on which way I should go? I usually end up getting a kill or two early so it helps me to get some AP rolling and stay useful but I do prefer to find ways to stay useful even when I am gold starved.