Thanks for the feedback, I think that's probably what I'm gonna go for. B16A2, I mean.
Is that something I could have sent directly to the shop (if I order it online), or am I better off taking the time to do - or learn to do - the swap myself?
Like I said, big time n00b here, but I'm trying...