Jeeze this thread has grown.
Anyway, on my suggestion for splitting hyperdrive and jumpdrive...
I feel that Hyperdrive should be faster travel overall, than jumpdrives, but slower than warpgates (on account of warpgates having massive distance advantages over jumpdrives).
No charge time on...