Address & Shopping cart data not sent to paypal when using Payflow Pro API

[FrankStephen]

I am using Zen cart v1.5.4, have a UK store and I am having trouble configuring PayPal Payments Pro (rev1.5.4). I would like to use the 3D Secure Authentication but this only works when I use the Payflow Pro API. The problem is the module is only sending shopping cart and address data to PayPal when using the PayPal API credentials and by setting the module to Merchant Country USA, If I change this to Merchant Country to UK and supply PAYFLOW settings 3d secure works but the address and card information is omitted in my paypal account and they state they have no address on file.

[FrankStephen]

Found a fix in an older post I changed this line (809) from /includes/modules/payment/paypaldp.php from
Code:
$optionsAll, array_merge($optionsNVP, $optionsShip));
to
Code:
array_merge($optionsAll, $optionsShip), $optionsNVP);

and this fixed the address issue but shopping cart data is still not being sent to PayPal. I wish 3D Secure Authentication was compatible with PayPal API credentials.