Thousand Battles and Already died are fine.
I'm gonna say no the master plan, it does make sense but I agreed with them taking it out. Tell you what, I'll let you take ranks in Inspire, and I'll let it last longer than one round (Circumstantially based on how well you guys planned - which is usually extensively - and whether anything very unforseen happens.)
As far as the arcahic weapons master, I had something similar in mind. I'll let you rework your character a bit if you'd like, and take a general 'damage' ability
"Weapons Master" - Uomo's mastered pretty much every weapon ever made, and can use them all with deadly skill.
You already have 'improvised weapon', I'll give you a "Weapon Master' feature allowing it to apply to ANY weapon you wield(Guns, knives, swords) that Uomo is likely to have practice with (so If you come across, say, a laser or Bat'leth, chances are you won't be able to use it, but anything else.. sure). Then you can do a bit of redesigning to respend those points.
I'd suggest keeping the 4 points you have in 'unarmed' right now, and then dropping Improvised weapons to rank 7. Then your attacks with anything will be +9 hit and dmg rank 6+weapon (Most of the weapons have dmg rank 3+, which will allow you to stay at your PL cap) Then you can use power attack/accurate attack and regardless of what weapon you're wielding you can be attacking anywhere from "+4 attack, Damage rank 14" to "+14 attack, Damage rank 4"
For the Expertise, How about I give you a new expertise you can put points into : Expertise(Experienced). It's a general mashup of expertises, I'll let you use it for anything you can justify Uomo knowing. (The older, the easier).
I'll also allow, if you wish, an "Improved Assessment" advantage, based on Uomo having been in so many battles that he knows how people fight: Pick one of the following: Either you can take 10 on Assessment checks, or you gain one extra sucess when you succed, or you can apply it to multiple opponents. Each is a different rank, you can take it three times to get an Assessment check of 10+insight vs ALL targets deception checks, with an extra degree of success on any you beat.