This way of orthogonoalizing is harmless if you test jointly all the hrf terms. Note that in the case of standard hrf + time derivative, these are quasi orthogonal by definition.
But you're right, we should think of making it optional.