x2y caps and common mode chokes (using both)
That depends on whether you're most concerned with radiation or immunity.  If you don't want the noise getting out, put the cap on the line side.  If you don't want the noise getting in, put it on the load side.  If both are concerns, use a pi configuration.