I would agree, straight conversion from Query to Stored Proc would not stop dead lock.

Rather get the queries working right then convert them to a stored procedure.