So I spoke with/emailed the companies mentioned and here is the reply I received from one of them:
Both your fork and shock are our base line models which only offer rebound adjustment, you can have them custom tuned to suit your weight and riding style but this can’t easily be adjusted by your self or out on a ride. It sounds like you will benefit by upgrading them, its difficult to get a set up that works for every type of riding. This is why we have the RC2 and RLC dampers for your forks; this offers lots of adjustment which can be changed easily out on a ride. Same with our RP23 rear shocks which have better a feel with high volume and Pro Pedal options.
Not very helpful considering I asked what they could do with what I already had.
Luckily, TFTuned were very helpful and I had a 15 minute chat with one of their guys who explained a bit of the science behind the problems I had and what they could do do try to sort this. Suffice to say, the shock is going in to be pushed and the forks to have a fettle. I’d much rather spend £200 or so with TFTuned getting this done than listen to the first company who seem more interested in upselling the Fox product range rather than attempting to help me out.