Picked the starter up this morning, it was apparently full of crap and the brushes were fairly well worn so the cleaned it out and replaced them, only ended up costing me $88 thankfully, just wish those guys were the ones I took it to the first time around could've saved a fair bit..
Only downside was nearly setting the car on fire by forgetting the earth strap near the starter.. Rookie mistake, haha..