In computational electromagnetics, numerical methods are generally optimized for triangular or tetrahedral meshes. However, typical objects of general interest in electronics, such as diode packages or antennas, have a Manhattan-type geometry that can be modeled with orthogonal and rectangular meshes. The advantage of orthogonal meshes is that they allow analytic solutions of the integral equations. In this work, we optimize the decoupling of the integrals used in the Surface formulation of the Partial Element Equivalent Circuit (S-PEEC) method for rectangular meshes. We consider a previously proposed decoupling strategy, and we lighten the underlying math by generalizing it. The new method shows improved accuracy and computational time because the number of decoupling integrals is generally reduced. The new S-PEEC method with decoupling integrals is named S-PEEC-DI. The S-PEEC-DI method is tested on a realistic diode package and compared with the volumetric PEEC (V-PEEC) and two well-known commercial solvers.