I've lately begun to use something called Holosync...very relaxing after it tears you up when you first get into it.
As to boxing...Your trainer needs to be after that, getting you to relax and be loose. You can see when a guy is tight, all tensed up, and you need to call him on it and get him to loosen up. You'll never perform up to full potential if you are tight.