This is starting to look great. I don't thing you can spend "too much" time doing the foundations of anything. You can always submit it as a prototype and carry on after the Jam end.
My issue with that is I've been doing a lot of gamejams in a row lately, so if the game gets submitted unfinished I'll likely never finish it lol. But in my last post I decided on a compromise.