Oh I agree, it would have been if it was anything other than being murder by Gangsta Granny. HO are brilliant at shock deaths (Lyndsey Nolan being the best I can think of) but Tony deserves to go out with a bang when his time comes.
I reckon they will have him kept at the pig farm until Oct stunt week (or just before) where he will escape or Breda will be found out and someone will find Tony being held captive. They said the stunt week heavily involves him and his dad joins soon so they will drag out his kidnap for a while yet