Yeah I had to look for them for a while until a mate put me on to these guys: Tax Advisory Partnership

they can do both.

regards,
John