I've tried your mod and got it working perfectly.
However, i encountered a problem with the paypal portion.
I applied the codes respectively and it seemed working, however, no matter what currency is selected, when it comes into the ps_paypal.php, the $store_currency is still the defaulted currency.
Anyone having any ideas? Thanks!