Maybe time to go to proper Debian
Kali Linux looks like it's doing the job for now, but you may want to give proper Debian a look.
You may be able to bring in the desktop environment and other tools via the repositories, however installing Debian Jessie is probably going to be easier. Alternatives to consider would be Linux Mint, Ubuntu, Mepis…
For the moment though, that machine and OS has got you out of a hole, if nothing else.