Thanks for the advice/stories.
The only time I've had trouble so far was the girl at the US border who wanted to play 20 questions. "Who are you visiting?" "Where does he live?" "How do you know somebody in Waterloo if you live in Albany?"
I may just ask the Customs officer tonight about bringing a computer across. See what he/she says. Couldn't hurt right?