A few Idea's that may help, let me know.
question 1? : (This is a thematic concern) How would you ensure the importance of melee combat in a world where fire arms (conventional) are readily available.
Here are a few ways you could limit the over use of firearms
a) The Deflection Spell could be in cooperated into all forms of armour (Flax vest to power Armour)
b) Have most combats with several foes; firing into combat is a dangerous game.
c) Have large fumble ranges for firearms (you are more likely to have misfire/mistakes than with simple swords, such as misfire, damp ammo, safety left on, chamber explodes).
d) Have heavy laws regarding firearms use within city limits, or illegal to care firearms.
e) Have the locations have winding streets or small rooms where firearms would not be of much use
question 2? : How would magic effect contemporary life, business, war and politics? I.E how would we all feel if Gordon Brown could chuck a chi ball at Mr. Obama? (For lack of a better real world example.)
Life would carry on much the same, the majority of the people won’t have magic but will be used to it being around and using it without thinking, just as real people did to airplanes and mobile phones
Business and Politician would carry on as normal but would just have a new department, MR (magic resources) which would advise them on all things magical. The magic would just replicate current items, Mobile phones would run on a ‘communicate spell’, Magic Mirrors could ‘Fax’ documents. In regards to Mr Brown’s Chi Ball, Mr Obama would just have suitable security agents (mages) to stop such things or a magical jacket which would stop it.
In War the solider would still die in the same ways, and both side would be balanced with mages on and clerics. Similar Tech and Magic would soon available to both sides through development and espionage.