Adding interior drain tile to a basement

[Daox]

So, while I was chipping up a platform for my solar hot water tank, I found that there was no poured floor under it. Ever since purchasing the home I've had water issues in the basement. Its not horrible, but every spring and if we get a good few day downpour I get a little water down there. On top of that, I need a dehumidifier in the basement in the summer to keep the moisture in check, and that thing uses a fair amount of juice. So, obviously I'd love to fix it.

As the basement is now I do have a sump croc. It does fill and pump water out of the basement. But, there is no drain tile going to it, so whatever water gets there is just what seeps through the ground.

As I see it I have two options:

1) Remove the entire floor, lay down rock for good drainage, at this point I could add insulation even, and repour the floor. This is a ton of work, but is probably the best way to fix the problem. On top of it I'd like to put some dry lock on the walls as Ryland has suggested and at that point I think I'd be pretty well off.

2) This option is a lot less work, but I'm not sure if it will do everything I'd like it to. I would chip a trough around the outside wall of the basement. I'd lay rock down in the trough and put down drain tile. Then, I would simply repour on top of the trough area. I'd also dry lock the walls and see how that would do.

My question to you guys is basically do you think options #2 is going to get rid of enough water, or should I just go all out? Is there another option I'm not considering? I can tell you from the tiny bit of smashing the concrete platform I've done so far, it is gonna be a huge pain taking out the entire floor. So, I'd like to avoid it if possible.