I'd recommend swimming too, fast and non stop really helps tone you up and improve endurance
For whole upper body id say a sledgehammer-tyre workout is great, really fucks you up after a while
I don't go over 2 hours but i work hard, at the moment im only benching 155 pounds (70kg) 3 sets of 8, but im only 3 months in, I also do +10 sets at 40-50kg on some days for endurance, elivated pressups when holding dumbells (for more dip), wide grip pullups, dumbbells, side abs machine and normal abs machine, crunches, running, wrist and military press, pretty much every day, only thing i change is type of bench im doing (higher weight-lower rep-set/lower weight-higher rep-set) I also do leg some days, but for anyone who wants to start going, just start at your own pace dont stress yourself too much, then just keep overloading as you go on to improve