No, I haven't felt anymore. The bizarre thing is that while it was all shaking, I couldn't move at all. I just spent those 20 seconds (not sure how long it was really), holding to the table (which was moving) in disbelief! And when it was all finished I got my bag and ran downstairs 
Dd didn't feel it, but then all the school was taken outside in the garden, to wait for a while.
Gio, I think you are doing the right thing re school. There is always plenty of time for a change if things don't turn out ok.
My advise is to keep your eyes open, chat to as many parents as you can, you will soon learn who to trust (never believe 100% of what other parents say!).
Expect ds to be knackered the first year of primary, so don't sign him up for too many activities after school. And always pick him up with a good merenda!
He'll be fine!!! 