Wouldn't add limes or lemon - add slices at serving the acidity coulod be v. problematic... (If you want to be genuinely mexican add salt as well as the slice of lime when drinking)
You could add lime and lemon zest, cascade would be more grapefruity flavours, citra more like passionfruit...