Minor improvement and don't override customer's selected shipping method

Two optimizations - firstly, don't check the block if the functionality is disabled in System>Config, and secondly, don't override the customer's selection