for 1st one yeah and added normal hitnormal for slider end too, for 2nd one the short normal hitwhistle on the sliderend sounds super weak imo so staying with soft hitfinish
good idea but i think the completely straight stream fits the held organ in the background more + imo a wiggle stream would look kinda weird with the somewhat clean curvy stream right after it