Hi Nicola,
Sounds like you have it all under control then.
To be honest, there are lots of books I could recommend, but these days I tend to suggest video training first and foremost (www.kelbytraining.com), but I'm wondering if the language barrier might be a problem?