I no longer feel the "magic" that I did on my first few visits, but, I wasn't expecting it to feel the same upon repetition. I liken it to the thing we feel if we go back to the house we grew up in and marvel at how small it is now compared to when we were kids. Sadly, the house didn't change... we did.
I think your idea of doing the safari twice is a good idea. Every time you go you'll experience something different. Try in the morning and then in the afternoon. Oddly enough, if it's raining, don't hesitate to go on the safari then. Our experience is that many animals seem to be more active then. In some ways, you might even consider doing the walking trails a couple of times.
I really think you would, because all the stuff that made you attracted to it still exists in different things. It's the general atmosphere, not tainted by negative feedback, that made you like it as much as you did. That still exist for first timers. Yes, there is a lot more planning involved then necessary years ago, but, that like everything else is the norm on a first trip now.
