If that's the case I would like to re-recommend using the monk as the base then using the UA/DMG rules to add rapiers, allow martial arts and flurry of blows to be used with light and monk weapons, remove the unarmed strike, and alter the elemental monks spells to be more Jedi-appropriate. If...