Finally fixed the warping issue, a bit of abs juice and the parts stick with no noticeable warping. Gonna start printing all the parts once I tune in the tolerances I need.

Anyone got any thoughts on if I should go for 31.8mm or 25.4 mm tubing?