So think I've got it all working again, not 100% sure what was happening but in case anyone else has a similar Alexa problem I suspect it's because I had a light switch called "kitchen" and there was a room in Alexa called "kitchen" too. Renaming the room to "kitchen room" seems to have got everything back to normal.
Was working fine when I had two separate switches "kitchen on" and '"kitchen off" but everything started going strange once I had the parameters on/off switch.
TLDR: Alexa doesn't like a triggercmd switch with same name as a room.