Why not both? Let your SO be the only one who pleases you on this level, physically, mentally and emotionally. Ignore those voices that try to tell you that you can't be happy without these old ways of pleasing yourself. Your relationship will improve 100x, I speak from experience.