...just one other thing, when I reboot it switches back to UK and I am not too hot on setting startup script lines on bodhi (only AUTOEXEC.BAT from my Windows days)
I think setting the default is obviously better. But FYI, moksha does have an autoexec script, you can find it in ~/.e/e/applications/startup/startupcommands.
I do not have swami control installed, but I believe maybe it has GUI for this default keyboard settings; maybe not? There's also a moksha keyboard module you can load if you often switch back and forth between two layouts. But I think in your case you want the change default.