So after some loss of strength and a lot of frustration, then a lot of great advice on the forums here I am resetting my 5/3/1 workout and using the triumvirate template. here is day 1 of week 1.
Bench 5/3/1: 90x5, 110x5, 130x3, 165x5, 175x5, 185x10 (had atleast 2-3 left in the tank)
Pullups/chinups: x5, x8, x7, x5, x5, x5
Incline DB bench: (40lbs per DB) 40x10, 40x10, 40x15, 40x15
DB Rows: (1 side at a time with 40lbs DB's) 40x10, 40x10, 40x15, 40x15
was done in 50 minutes