Porcupine Tree. I think you'll love them being into Tool. Their older stuff is quite Floydish but they start bringing in metal elements around Lightbulb Sun and they get into Tool territory. Give In Absentia a listen.