Weightroom

That should work pretty well for you. You could look at some of the 3 day templates (Full body 1000% awesome, beginners, maybe a few others) and just row anytime you see overhead press called for, would get you a bit more volume on main lifts.

Jim is pretty adamant about not going over 5/10lbs even if you do well on the AMRAPs, but honestly I think if you blow them out of the water then you'd be fine to increase that lift more. And you'll know if your TM is too high if the heavy sets turn into a grind-fest. Just drop the TM down a bit in that case and push forward. You want all your reps to be at a good speed, that's the sweet spot for sub-max training

Accessories are just whatever floats your boat. Normally he calls for 50 push, 50 pull, 50 single leg / core every workout but he also says over and over it doesn't really matter, he never gives much attention to accessories. You should be able to superset them to save on time and be well under an hour