Swordstaff for Pathfinder

[Maquise]

I was wondering if there was a good way to get a Dragon Age 2 style sword staff for pathfinder, and have it compatible with a Magus.

[Knaight]

The first part is easy: Refluff the halberd. The existing stats are:
{table]Weapon|Cost|Dmg. Small|Dmg. Medium|Critical|Weight|Type|Special
Halberd|10 gp|1d8|1d10|x3|12 lbs.|P or S|brace, trip[/table]
Magus are proficient, however it is a two handed weapon, which nullifies their Spell Combat ability. That said, it was also a two handed weapon in the game, if I remember correctly, so it should be fine.

[Maquise]

The Staff Magus archetype grants them the ability to use a staff one-handed (actually its a feat they get as a bonus). I'd like to find a way to make use of Spell Combat if possible.