Non-EU Citizen, PACSed & trying to stay in France

[Australin_Paris]

Try to bear with me here, this situation is a little complicated...

I'm Australian & been living in France for the past 8 months under the Working Holiday Program. Intent on staying here, on arrival my partner (who's French) & I worked very hard in getting our documentation together from the moment I arrived (Late May 2013) & our PACS went through in the middle of January 2014. We have sufficient proof from the 25th of May 2014 that we've been living together for one year.

I'm not keen to leave France, as living here (in Paris) is really, really nice! However there's a Gap in my Visa with my Working Holiday Visa expiring on the 5th of May 2014 & I'm not eligible for the French Long Stay visa called "vie privée et familiale" until the 25th of May. My partner & I are currently employed & a gap in my visa would be a real inconvenience. Despite it sounding like just less than a 3 week gap, dealing with the French visa departments hasn't been easy thus far & it would more than likely be a longer period of unemployment.

Does anyone know if I can avoid this break? My own government has told me that I might need to leave the country & apply in Australia for the Visa. The phrase "every situation is different" came up several times... Does anyone know which french departments to be dealing with or any ideas on whom I should be contacting for assistance? Currently this page here has given me some help: http://ielanguages.com/pacs.htm

I really hope someone out there has some history in dealing with a similar situation & thanks in advance for anyone who responds!

Cheers,