I see your in Scotland.
I highly recommend automek in East Kilbride the only garage I trust now and they specialise in Jap cars. They don't take the **** so if you gave them the list of problems I'm sure they could sort you out far cheaper than main dealer. Also they have no problem with me bringing used/new parts to them for me to save a bit.